Home | Content | Search | Navigation | Indexes
 

Mailinglist Archive: opensuse-commit (1318 mails)

< Previous Next >
commit xorg-x11-Xvnc
  • From: root@xxxxxxx (h_root)
  • Date: Wed, 9 Aug 2006 18:00:58 +0200 (CEST)
  • Message-id: <20060809160058.A742694E98@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package xorg-x11-Xvnc
checked in at Wed Aug 9 18:00:57 CEST 2006.

--------
New Changes file:

--- /dev/null 2002-12-09 23:01:21.000000000 +0100
+++ xorg-x11-Xvnc/xorg-x11-Xvnc.changes 2006-08-09 14:11:19.000000000 +0200
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Wed Aug 9 14:11:18 CEST 2006 - sndirsch@xxxxxxx
+
+- created package
+

New:
----
64bit.diff
vnc-16x16.png
vnc-24x24.png
vnc-48x48.png
vnc-4_1-javasrc.tar.gz
vnc-4_1_2-unixsrc.tar.gz
vnc-64bit.patch
vnc-build.patch
vnc-cookie.patch
vnc-def.patch
vnc-fPIC.patch
vnc-fontpath.patch
vnc-gcc4.patch
vnc-idle.patch
vnc-modular-xorg.patch
vnc-newfbsize.patch
vnc-nohttpd.patch
vnc-null-interface.patch
vnc-opengl.patch
vnc-ppc64.patch
vnc-restart.patch
vnc-s390.patch
vnc-select.patch
vnc-use-fb.patch
vnc-via.patch
vnc-viewer-reparent.patch
vnc-vncpasswd.patch
vnc-xclients.patch
vncserver.init
xorg-server-1.1.0.tar.bz2
xorg-x11-Xvnc.changes
xorg-x11-Xvnc.spec

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ xorg-x11-Xvnc.spec ++++++
#
# spec file for package xorg-x11-Xvnc (Version 4.1.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#


Name: xorg-x11-Xvnc
%define xorg_version 1.1.0
%define vnc_version 4_1_2
%define java_vnc_version 4_1
Summary: VNC Server for the X Window System
Version: 4.1.2
Release: 1
URL: http://xorg.freedesktop.org/
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
# This is from 'rpmbuild -bp xorg-x11.spec':
Source2: xorg-server-%{xorg_version}.tar.bz2
Source3: vncserver.init
Source5: vnc-16x16.png
Source6: vnc-24x24.png
Source7: vnc-48x48.png
Patch0: vnc-cookie.patch
Patch1: vnc-gcc4.patch
Patch2: vnc-use-fb.patch
Patch3: vnc-xclients.patch
Patch4: vnc-idle.patch
Patch5: vnc-via.patch
Patch6: vnc-build.patch
Patch7: vnc-fPIC.patch
Patch8: vnc-restart.patch
Patch9: vnc-vncpasswd.patch
Patch10: vnc-def.patch
Patch11: vnc-modular-xorg.patch
Patch12: vnc-nohttpd.patch
Patch13: vnc-fontpath.patch
Patch14: vnc-s390.patch
Patch15: vnc-viewer-reparent.patch
Patch16: vnc-64bit.patch
Patch17: vnc-select.patch
Patch18: vnc-null-interface.patch
Patch19: vnc-ppc64.patch
Patch20: vnc-opengl.patch
Patch21: vnc-newfbsize.patch
Patch22: 64bit.diff
License: GPL
Group: System/X11/Servers/XF86_4
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildPrereq: /usr/bin/perl tcpd
BuildRequires: libjpeg-devel zlib-devel
BuildRequires: desktop-file-utils >= 0.2.92
BuildRequires: gcc-java
BuildRequires: autoconf automake bison flex libtool patchutils pkgconfig
BuildRequires: expat freetype2-devel
BuildRequires: gcc-c++ xorg-x11-devel
%ifnarch s390 s390x ppc64
BuildRequires: libdrm-devel
%endif

%description
An X Window System server for Virtual Network Computing (VNC).



Authors:
--------
Egbert Eich
Keith Packard
Roland Mainz
Alan Coopersmith
Russ Blaine
Alexander Gottwald
Alan Hourihane
Chisato Yamauchi
Eric Anholt
Nolan Leake
Stefan Dirsch
Rik Faith
Daniel Berrange
Matthieu Herrb
John Heasley
Ryan Underwood
Alex Deucher
Ty Sarna
Torrey T Lyons Darwin
Stuart Kreitman
Kevin E. Martin
Greg Parker
John Harper
Adam Jackson
Peter Kunzman
Aaron Plattner
Chisato Yamauchi
Michel Daenzer
Kristian Høgsberg
Søren Sandmann
Owen Taylor
Mike A. Harris
Ivan Kokshaysky
Bryan Stine
Guy Martin
Paul Anderson
Yu Shao
David Dawes
Harold L. Hunt II
Andreas Luik
Travis Tilley
Ryan Lortie
Ryan Breen
Deron Johnson
Ronny Vindenes
Jim Gettys

%prep
%setup -q -n vnc-%{vnc_version}-unixsrc -a1
pushd unix
bzip2 -dc %{SOURCE2} | tar -xkf - || :
popd
%patch0 -p1 -b .cookie
%patch1 -p1 -b .gcc4
%patch2 -p1 -b .use-fb
%patch3 -p1 -b .xclients
%patch4 -p1 -b .idle
%patch5 -p1 -b .via
%patch6 -p1 -b .build
%patch7 -p1 -b .fPIC
%patch8 -p1 -b .restart
%patch9 -p1 -b .vncpasswd
%patch10 -p1 -b .def
%patch11 -p1 -b .modular-xorg
%patch12 -p1 -b .nohttpd
pushd unix/xorg-server-*
%patch13 -p3 -b .fontpath
%patch14 -p3 -b .s390
popd
%patch15 -p1 -b .viewer-reparent
%patch16 -p1 -b .64bit
%patch17 -p1 -b .select
#patch18 -p1 -b .null-interface
%patch19 -p1 -b .ppc64
%patch20 -p1 -b .opengl
%patch21 -p1 -b .newfbsize
%patch22 -p0 -b .64bit
cp -a unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \
unix/xc/programs/Xserver/Xvnc.man \
unix/xc/programs/Xserver/vnc/*.{h,cc} \
unix/xorg-server-*/hw/vnc/
cp -a unix/xorg-server-*/{cfb/cfb.h,hw/vnc}
cp -a unix/xorg-server-*/{fb/fb.h,hw/vnc}
cp -a unix/xorg-server-*/{fb/fbrop.h,hw/vnc}
sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \
unix/xorg-server-*/hw/vnc/{cfb,fb,fbrop}.h

%build
cd unix
autoconf # For use-fb patch
%configure --with-installed-zlib --with-fb
pushd ../common
%configure --with-installed-zlib
popd
make
cd ../vnc-%{java_vnc_version}-javasrc/java
#make JAVAC="gcj -C" JAR=fastjar
cd ../../unix/xorg-server-*
aclocal --force ; automake ; autoconf
%configure --enable-xorg \
--disable-dependency-tracking \
--disable-xprint \
--disable-static \
--enable-composite \
--with-os-name="openSUSE" \
--with-os-vendor="SUSE LINUX" \
--with-fontdir="/usr/share/fonts" \
--with-xkb-path="/usr/share/X11/xkb" \
--with-xkb-output=/var/lib/xkb/compiled \
--with-rgb-path=%{_datadir}/X11/rgb \
--disable-xorgcfg \
--disable-dmx \
--disable-lbx \
--enable-xdmcp \
--disable-xevie \
--disable-dri \
--with-int10=stub
cp -f %{_bindir}/libtool .
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
cd unix
mkdir -p $RPM_BUILD_ROOT/%{_bindir} \
$RPM_BUILD_ROOT/%{_mandir}/man1 \
$RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions
install -m 755 xorg-server-*/hw/vnc/Xvnc $RPM_BUILD_ROOT/%{_bindir}
install -m 644 xorg-server-*/hw/vnc/Xvnc.man $RPM_BUILD_ROOT/%{_mandir}/man1/Xvnc.1
%ifnarch s390 s390x
install -m 755 xorg-server-*/hw/vnc/.libs/libvnc.so \
$RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc LICENCE.txt README
%ifnarch s390 s390x
%dir %{_libdir}/xorg
%dir %{_libdir}/xorg/modules
%dir %{_libdir}/xorg/modules/extensions
%endif
%{_bindir}/Xvnc
%{_mandir}/man1/Xvnc.1*
%ifnarch s390 s390x
%{_libdir}/xorg/modules/extensions/libvnc.so
%endif

%changelog -n xorg-x11-Xvnc
* Wed Aug 09 2006 - sndirsch@xxxxxxx
- created package
++++++ 64bit.diff ++++++
--- unix/vncviewer/CConn.cxx.orig 2006-08-09 12:49:22.000000000 +0200
+++ unix/vncviewer/CConn.cxx 2006-08-09 12:51:11.000000000 +0200
@@ -389,7 +389,7 @@
tv.tv_sec = 0;
tv.tv_usec = 200*1000;
select(0, 0, 0, 0, &tv);
- execlp(programName, programName, 0);
+ execlp(programName, programName, NULL);
perror("execlp"); exit(1);
}
break;
--- unix/xorg-server-1.1.0/xkb/maprules.c.orig 2006-08-09 12:52:29.000000000 +0200
+++ unix/xorg-server-1.1.0/xkb/maprules.c 2006-08-09 12:55:34.000000000 +0200
@@ -1092,7 +1092,7 @@
for ( ; GetInputLine(file,&line,False); line.num_line= 0) {
if (line.line[0]=='!') {
tok = strtok(&(line.line[1]), " \t");
- if (_XkbStrCaseCmp(tolower(tok),"model") == 0)
+ if (_XkbStrCaseCmp((char *)tolower((int)tok),"model") == 0)
headingtype = HEAD_MODEL;
else if (_XkbStrCaseCmp(tok,"layout") == 0)
headingtype = HEAD_LAYOUT;
--- unix/xorg-server-1.1.0/hw/xfree86/common.orig/xf86Events.c 2006-06-27 10:16:25.000000000 +0000
+++ unix/xorg-server-1.1.0/hw/xfree86/common/xf86Events.c 2006-06-27 10:43:01.000000000 +0000
@@ -1292,8 +1292,8 @@
size_t size, i;
char **strings;
ErrorF("\nBacktrace:\n");
- size = backtrace(array, 32);
- strings = backtrace_symbols(array, size);
+ size = (size_t) backtrace(array, 32);
+ strings = (char **) backtrace_symbols(array, size);
for (i = 0; i < size; i++)
ErrorF("%d: %s\n", i, strings[i]);
free(strings);
--- unix/xorg-server-1.1.0/cfb/cfbblt.c.orig 2006-08-09 14:09:19.000000000 +0200
+++ unix/xorg-server-1.1.0/cfb/cfbblt.c 2006-08-09 14:10:03.000000000 +0200
@@ -39,6 +39,7 @@
#endif

#include <stdlib.h>
+#include <string.h>

#include <X11/X.h>
#include <X11/Xmd.h>
++++++ vnc-64bit.patch ++++++
--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.h.64bit 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/XserverDesktop.h 2005-12-06 14:31:11.000000000 +0000
@@ -29,6 +29,8 @@
#include <rfb/VNCServerST.h>
#include <rdr/SubstitutingInStream.h>

+#include "xorg-server.h"
+
extern "C" {
#define class c_class;
#include <scrnintstr.h>
--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.64bit 2005-12-06 14:31:24.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-12-06 14:31:30.000000000 +0000
@@ -973,25 +973,6 @@

} /* end InitOutput */

-#ifdef DPMSExtension
-extern "C" {
-#if NeedFunctionPrototypes
- void DPMSSet(CARD16 level)
-#else
- void DPMSSet(level)
- CARD16 level;
-#endif
- {
- return;
- }
-
- Bool DPMSSupported()
- {
- return FALSE;
- }
-}
-#endif
-
/* this is just to get the server to link on AIX */
#ifdef AIXV3
int SelectWaitTime = 10000; /* usec */
++++++ vnc-build.patch ++++++
reverted:
--- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2005-03-10 14:51:39.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2004-12-01 17:27:58.000000000 +0000
@@ -48,7 +48,7 @@
* Make sure XINPUT, XF86VidTune, etc arent defined for the miinitext.o
* used by Xvnc
*/
+EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
-EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC
#endif


@@ -70,7 +70,7 @@
SpecialCplusplusObjectRule(xvnc,$(ICONFIGFILES) xvnc,$(EXT_DEFINES) $(NO_OPERATOR_NAMES))

LinkSourceFile(miinitext.c,$(SERVERSRC)/mi)
+SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER)
-SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES) -DNO_MODULE_EXTS $(EXT_MODULE_DEFINES) -UXFree86LOADER)

/* InstallManPage(Xvfb,$(MANDIR)) */
DependTarget()
++++++ vnc-cookie.patch ++++++
--- vnc-4_1-unixsrc/unix/vncserver.cookie 2005-02-23 12:28:18.000000000 +0000
+++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 22:04:28.000000000 +0000
@@ -116,18 +116,12 @@
$desktopLog = "$vncUserDir/$host:$displayNumber.log";
unlink($desktopLog);

-# Make an X server cookie - use as the seed the sum of the current time, our
-# PID and part of the encrypted form of the password. Ideally we'd use
-# /dev/urandom, but that's only available on Linux.
-
-srand(time+$$+unpack("L",`cat $vncUserDir/passwd`));
-$cookie = "";
-for (1..16) {
- $cookie .= sprintf("%02x", int(rand(256)) % 256);
-}
-
-system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
-system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie");
+# Make an X server cookie - use mcookie
+$cookie = `/usr/bin/mcookie`;
+open (XAUTH, "|xauth -f $xauthorityFile source -");
+print XAUTH "add $host:$displayNumber . $cookie\n";
+print XAUTH "add $host/unix:$displayNumber . $cookie\n";
+close XAUTH;

if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
++++++ vnc-def.patch ++++++
--- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in.def 2003-07-07 10:51:22.000000000 +0100
+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in 2004-05-27 13:24:02.489007854 +0100
@@ -6,7 +6,8 @@
#define BuildNls NO
#define BuildXIE NO
#define BuildGlxExt NO
-#define XnestServer NO
+#define XnestServer YES
+#define XF86Server NO
#define XprtServer NO

#ifdef SunArchitecture
++++++ vnc-fPIC.patch ++++++
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile.fPIC 2005-03-04 14:33:47.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/module/Imakefile 2005-03-04 14:34:16.000000000 +0000
@@ -21,7 +21,8 @@
LinkSourceFile(xf86vncModule.cc,..)
LinkSourceFile(XserverDesktop.cc,..)

-ModuleObjectRule()
+.CCsuf.Osuf:
+ NormalSharedLibObjCplusplusCompile($(_NOOP_))
/*
LibraryModuleTarget(vnc,$(OBJS) $(VNCLIBS))
InstallLibraryModule(vnc,$(MODULEDIR),extensions)
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile.fPIC 2005-03-04 14:34:24.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Imakefile 2005-03-04 14:34:52.000000000 +0000
@@ -36,8 +36,8 @@
NormalLintTarget($(SRCS))

NormalLibraryObjectRule()
-NormalCplusplusObjectRule()
-
+.CCsuf.Osuf:
+ NormalSharedLibObjCplusplusCompile($(_NOOP_))

MakeSubdirs($(SUBDIRS))
DependSubdirs($(SUBDIRS))
--- vnc-4_1-unixsrc/unix/boilerplate.mk.fPIC 2005-03-04 14:35:03.000000000 +0000
+++ vnc-4_1-unixsrc/unix/boilerplate.mk 2005-03-04 14:35:23.000000000 +0000
@@ -15,7 +15,7 @@
CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
CCLD = $(CC)
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
CXXLD = $(CXX)
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
--- vnc-4_1-unixsrc/common/Xregion/Makefile.in.fPIC 2005-03-04 14:32:24.000000000 +0000
+++ vnc-4_1-unixsrc/common/Xregion/Makefile.in 2005-03-04 14:32:36.000000000 +0000
@@ -12,4 +12,5 @@
$(AR) $(library) $(OBJS)
$(RANLIB) $(library)

+DIR_CFLAGS = -DPIC -fPIC
# followed by boilerplate.mk
--- vnc-4_1-unixsrc/common/network/Makefile.in.fPIC 2005-03-04 14:32:44.000000000 +0000
+++ vnc-4_1-unixsrc/common/network/Makefile.in 2005-03-04 14:32:58.000000000 +0000
@@ -14,4 +14,5 @@
$(AR) $(library) $(OBJS)
$(RANLIB) $(library)

+DIR_CXXFLAGS = -DPIC -fPIC
# followed by boilerplate.mk
--- vnc-4_1-unixsrc/common/rdr/Makefile.in.fPIC 2005-03-04 14:33:05.000000000 +0000
+++ vnc-4_1-unixsrc/common/rdr/Makefile.in 2005-03-04 14:33:16.000000000 +0000
@@ -16,4 +16,5 @@
$(AR) $(library) $(OBJS)
$(RANLIB) $(library)

+DIR_CXXFLAGS = -DPIC -fPIC
# followed by boilerplate.mk
--- vnc-4_1-unixsrc/common/rfb/Makefile.in.fPIC 2005-03-04 14:33:20.000000000 +0000
+++ vnc-4_1-unixsrc/common/rfb/Makefile.in 2005-03-04 14:33:33.000000000 +0000
@@ -65,4 +65,6 @@
$(AR) $(library) $(OBJS)
$(RANLIB) $(library)

+DIR_CFLAGS = -DPIC -fPIC
+DIR_CXXFLAGS = -DPIC -fPIC
# followed by boilerplate.mk
--- vnc-4_1-unixsrc/common/Makefile.in.fPIC 2005-03-04 15:08:57.000000000 +0000
+++ vnc-4_1-unixsrc/common/Makefile.in 2005-03-04 15:09:25.000000000 +0000
@@ -1,4 +1,6 @@

SUBDIRS = @ZLIB_DIR@ rdr network Xregion rfb

+DIR_CFLAGS = -DPIC -fPIC
+DIR_CXXFLAGS = -DPIC -fPIC
# followed by boilerplate.mk
--- vnc-4_1-unixsrc/common/boilerplate.mk.fPIC 2005-03-04 15:09:32.000000000 +0000
+++ vnc-4_1-unixsrc/common/boilerplate.mk 2005-03-04 15:09:49.000000000 +0000
@@ -15,7 +15,7 @@
CFLAGS = @CFLAGS@ $(DIR_CFLAGS)
CCLD = $(CC)
CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ $(DIR_CXXFLAGS)
CXXLD = $(CXX)
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
++++++ vnc-fontpath.patch ++++++
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac.fontpath 2005-12-21 11:14:58.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/configure.ac 2005-12-21 11:16:56.000000000 +0000
@@ -339,9 +339,9 @@
AC_ARG_WITH(mesa-source, AS_HELP_STRING([--with-mesa-source=MESA_SOURCE], [Path to Mesa source tree]),
[ MESA_SOURCE="$withval" ],
[ MESA_SOURCE="" ])
-AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]),
+AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${datadir}/X11/fonts)]),
[ FONTDIR="$withval" ],
- [ FONTDIR="${libdir}/X11/fonts" ])
+ [ FONTDIR="${datadir}/X11/fonts" ])
DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/"
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
[ FONTPATH="$withval" ],
++++++ vnc-gcc4.patch ++++++
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.gcc4 2005-03-04 13:52:03.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc 2005-03-04 13:52:24.000000000 +0000
@@ -751,7 +751,7 @@
rep.timeout = qcTimeout;
rep.addrLen = qcTimeout ? strlen(qcAddress) : 0;
rep.userLen = qcTimeout ? strlen(qcUsername) : 0;
- rep.opaqueId = (CARD32)queryConnectId;
+ rep.opaqueId = (CARD32)(long)queryConnectId;
rep.length = (rep.userLen + rep.addrLen + 3) >> 2;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
++++++ vnc-idle.patch ++++++
--- vnc-4_1-unixsrc/common/rfb/ServerCore.cxx.idle 2005-03-03 15:42:21.000000000 +0000
+++ vnc-4_1-unixsrc/common/rfb/ServerCore.cxx 2005-03-03 23:11:14.000000000 +0000
@@ -29,7 +29,7 @@
("IdleTimeout",
"The number of seconds after which an idle VNC connection will be dropped "
"(zero means no timeout)",
- 3600, 0);
+ 0, 0);
rfb::IntParameter rfb::Server::clientWaitTimeMillis
("ClientWaitTimeMillis",
"The number of milliseconds to wait for a client which is no longer "
++++++ vnc-modular-xorg.patch ++++++
--- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2006-06-13 17:47:02.000000000 -0400
+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2006-06-13 17:47:02.000000000 -0400
@@ -36,8 +36,6 @@
extern "C" {
#define class c_class
#define public c_public
-#define xor c_xor
-#define and c_and
#ifdef WIN32
#include <X11/Xwinsock.h>
#endif
@@ -72,11 +70,8 @@
#include "inputstr.h"
#include "keysym.h"
extern int defaultColorVisualClass;
- extern char buildtime[];
#undef class
#undef public
-#undef xor
-#undef and
#ifndef VNC_USE_FB
extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
@@ -221,7 +216,7 @@

void ddxUseMsg()
{
- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
VENDOR_STRING);
ErrorF("-screen scrn WxHxD set screen's width, height, depth\n");
@@ -927,7 +922,7 @@

void InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
{
- ErrorF("\nXvnc %s - built %s\n%s", XVNCVERSION, buildtime, XVNCCOPYRIGHT);
+ ErrorF("\nXvnc %s\n%s", XVNCVERSION, XVNCCOPYRIGHT);
ErrorF("Underlying X server release %d, %s\n\n", VENDOR_RELEASE,
VENDOR_STRING);
wellKnownSocketsCreated = true;
--- /dev/null 2006-06-13 10:12:45.634275750 -0400
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/vnc/Makefile.am 2006-06-13 17:47:02.000000000 -0400
@@ -0,0 +1,85 @@
+noinst_LTLIBRARIES = libvnccommon.la
+libvnccommon_la_SOURCES = \
+ RegionHelper.h \
+ vncExtInit.cc \
+ vncExtInit.h \
+ vncHooks.cc \
+ vncHooks.h \
+ XserverDesktop.cc \
+ XserverDesktop.h
+
+libvnccommon_la_CXXFLAGS = \
+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
+ -DGC_HAS_COMPOSITE_CLIP \
+ -DVNC_USE_FB \
+ -I/usr/include/X11 \
+ -I../../../../common \
+ -I../../../vncconfig
+
+bin_PROGRAMS = Xvnc
+
+Xvnc_SOURCES = \
+ xvnc.cc \
+ $(top_srcdir)/Xext/dpmsstubs.c \
+ $(top_srcdir)/Xi/stubs.c \
+ $(top_srcdir)/mi/miinitext.c \
+ $(top_srcdir)/fb/fbcmap.c
+
+Xvnc_LDADD = $(XORG_CORE_LIBS) \
+ $(XORG_LIBS) \
+ $(XSERVER_LIBS) \
+ ../../fb/libfb.la \
+ ../../mi/libminimi.la \
+ ../../render/librender.la \
+ ../../xkb/libxkbstubs.la \
+ ../../dbe/libdbe.la \
+ ../../Xext/libXext.la \
+ ../../XTrap/libxtrap.la \
+ ../../record/librecord.la \
+ ../xfree86/os-support/libxorgos.la \
+ ../../os/libos.la \
+ ../xfree86/common/libcommon.la \
+ -lX11 \
+ libvnccommon.la \
+ ../../../../common/rfb/librfb.a \
+ ../../../../common/rdr/librdr.a \
+ ../../../../common/network/libnetwork.a \
+ ../../../../common/Xregion/libXregion.a
+
+Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \
+ -DNO_HW_ONLY_EXTS \
+ -DNO_MODULE_EXTS \
+ -DXFree86Server -DVNCEXT
+
+Xvnc_CXXFLAGS = $(Xvnc_CFLAGS) \
+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+ -DVENDOR_STRING="\"$(VENDOR_STRING)\"" \
+ -DVNC_USE_FB \
+ -I../../../../common \
+ -I../../../vncconfig \
+ -I../../mi \
+ -I ../../render \
+ -I/usr/include/X11
+
+libvnc_la_LTLIBRARIES = libvnc.la
+libvnc_la_LDFLAGS = -module -avoid-version
+libvnc_ladir = $(moduledir)/extensions
+libvnc_la_SOURCES = xf86vncModule.cc
+libvnc_la_LIBADD = \
+ libvnccommon.la \
+ ../../../../common/rfb/librfb.a \
+ ../../../../common/rdr/librdr.a \
+ ../../../../common/network/libnetwork.a \
+ ../../../../common/Xregion/libXregion.a
+libvnc_la_CXXFLAGS = \
+ -I../../../../common \
+ -I$(top_srcdir)/hw/xfree86/common \
+ -I$(top_srcdir)/hw/xfree86/os-support \
+ -I$(top_srcdir)/hw/xfree86/os-support/bus \
+ -DXFree86Module -DXFree86LOADER -DIN_MODULE
+
+AM_CXXFLAGS = $(CFLAGS) \
+ -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
+ -DVENDOR_STRING="\"$(VENDOR_STRING)\""
+
--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/Makefile.am.modular-xorg 2006-01-09 21:30:56.000000000 -0500
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/Makefile.am 2006-06-13 17:47:51.000000000 -0400
@@ -26,6 +26,8 @@
KDRIVE_SUBDIRS = kdrive
endif

+XVNC_SUBDIRS = vnc
+
# need to add darwin support here

SUBDIRS = \
@@ -35,6 +37,7 @@
$(XVFB_SUBDIRS) \
$(XNEST_SUBDIRS) \
$(DMX_SUBDIRS) \
+ $(XVNC_SUBDIRS) \
$(KDRIVE_SUBDIRS)

DIST_SUBDIRS = dmx xfree86 vfb xnest xwin darwin kdrive xgl
--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/configure.ac.modular-xorg 2006-05-22 13:18:49.000000000 -0400
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/configure.ac 2006-06-13 17:48:11.000000000 -0400
@@ -1720,6 +1720,7 @@
hw/xnest/Makefile
hw/xwin/Makefile
hw/darwin/Makefile
+hw/vnc/Makefile
hw/kdrive/Makefile
hw/kdrive/ati/Makefile
hw/kdrive/chips/Makefile
--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/mi/miinitext.c.modular-xorg 2006-03-11 19:11:34.000000000 -0500
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/mi/miinitext.c 2006-06-13 17:47:02.000000000 -0400
@@ -297,6 +297,9 @@
#ifdef MITMISC
extern void MITMiscExtensionInit(INITARGS);
#endif
+#ifdef VNCEXT
+extern void vncExtensionInit(INITARGS);
+#endif
#ifdef XIDLE
extern void XIdleExtensionInit(INITARGS);
#endif
@@ -577,6 +580,9 @@
#ifdef MITMISC
if (!noMITMiscExtension) MITMiscExtensionInit();
#endif
+#ifdef VNCEXT
+ vncExtensionInit();
+#endif
#ifdef XIDLE
if (!noXIdleExtension) XIdleExtensionInit();
#endif
--- vnc-4_1_2-unixsrc/unix/vncinstall.modular-xorg 2005-02-28 08:00:32.000000000 -0500
+++ vnc-4_1_2-unixsrc/unix/vncinstall 2006-06-13 17:47:02.000000000 -0400
@@ -56,7 +56,7 @@
fi
fi

-for f in xc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \
+for f in xorg-server-*/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \
vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do
if [ ! -f $f ]; then
echo "Couldn't find $f"
@@ -85,8 +85,8 @@

done

-vncModule=xc/programs/Xserver/vnc/module/vnc.so
-if [ -f "$vncModule" -a -d "$moduledst" ]; then
+vncModule=xorg-server-*/hw/vnc/.libs/libvnc.so
+if [ -f $vncModule -a -d "$moduledst" ]; then
if cmp -s $vncModule $moduledst/`basename $vncModule`; then
echo "`basename $vncModule` hasn't changed"
else
++++++ vnc-newfbsize.patch ++++++
--- vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx.newfbsize 2006-07-15 12:24:08.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/vncviewer/CConn.cxx 2006-07-15 12:23:29.000000000 +0200
@@ -305,6 +305,8 @@
if (encoding != encodingCopyRect) {
lastServerEncoding = encoding;
}
+ if (encoding == pseudoEncodingDesktopSize)
+ setDesktopSize( r.width(), r.height() );
}

void CConn::endRect(const Rect& r, unsigned int encoding)
++++++ vnc-nohttpd.patch ++++++
--- vnc-4_1_1-unixsrc/unix/vncserver.nohttpd 2005-08-08 15:51:09.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/vncserver 2005-08-11 12:13:59.000000000 +0100
@@ -58,6 +58,7 @@
# Check command line options

&ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
+ "-nohttpd",0,
"-help",0,"-h",0,"--help",0);

&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -78,6 +79,12 @@
if ($opt{'-pixelformat'}) {
$pixelformat = $opt{'-pixelformat'};
}
+if ($opt{'-nohttpd'}) {
+ $nohttpd = 1;
+ }
+else {
+ $nohttpd = 0;
+}

&CheckGeometryAndDepth();

@@ -137,7 +144,7 @@

$cmd = "Xvnc :$displayNumber";
$cmd .= " -desktop " . &quotedString($desktopName);
-$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles);
+$cmd .= " -httpd $vncJavaFiles" if ($vncJavaFiles && ! $nohttpd);
$cmd .= " -auth $xauthorityFile";
$cmd .= " -geometry $geometry" if ($geometry);
$cmd .= " -depth $depth" if ($depth);
@@ -413,7 +420,7 @@

sub Usage
{
- die("\nusage: $prog [:<number>] [-name <desktop-name>] [-depth <depth>]\n".
+ die("\nusage: $prog [:<number>] [-nohttpd] [-name <desktop-name>] [-depth <depth>]\n".
" [-geometry <width>x<height>]\n".
" [-pixelformat rgbNNN|bgrNNN]\n".
" <Xvnc-options>...\n\n".
--- vnc-4_1_1-unixsrc/unix/vncserver.man.nohttpd 2005-08-11 12:17:46.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/vncserver.man 2005-08-11 12:19:35.000000000 +0100
@@ -77,6 +77,11 @@
must be 8 bits deep.

.TP
+.B \-nohttpd
+Do not instruct Xvnc to run a mini-httpd if the VNC Java applet is
+found.
+
+.TP
.B \-kill :\fIdisplay#\fP
This kills a VNC desktop previously started with vncserver. It does this by
killing the Xvnc process, whose process ID is stored in the file
++++++ vnc-null-interface.patch ++++++
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.1.0/os/access.c.null-interface 2005-11-08 07:33:30.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.1.0/os/access.c 2006-05-09 09:36:25.000000000 +0200
@@ -975,12 +975,14 @@
return;
}
for (ifr = ifap; ifr != NULL; ifr = ifr->ifa_next) {
+ if (!ifr->ifa_addr)
+ continue;
#ifdef DNETCONN
if (ifr->ifa_addr.sa_family == AF_DECnet)
continue;
#endif /* DNETCONN */
len = sizeof(*(ifr->ifa_addr));
- family = ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr);
+ family = ifr->ifa_addr ? ConvertAddr(ifr->ifa_addr, &len, (pointer *)&addr) : -1;
if (family == -1 || family == FamilyLocal)
continue;
#if defined(IPv6) && defined(AF_INET6)
++++++ vnc-opengl.patch ++++++
--- vnc-4_1_2-unixsrc/unix/xc/config/cf/vnc.def.in.opengl 2006-05-24 16:39:55.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xc/config/cf/vnc.def.in 2006-05-24 16:40:18.000000000 +0200
@@ -5,7 +5,7 @@
#define BuildPexExt NO
#define BuildNls NO
#define BuildXIE NO
-#define BuildGlxExt NO
+#define BuildGlxExt YES
#define XnestServer YES
#define XF86Server NO
#define XprtServer NO
++++++ vnc-ppc64.patch ++++++
--- vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/xfree86/common/compiler.h.ppc64 2006-05-25 11:08:26.000000000 +0200
+++ vnc-4_1_2-unixsrc/unix/xorg-server-1.1.0/hw/xfree86/common/compiler.h 2006-05-25 11:08:58.000000000 +0200
@@ -1083,7 +1083,7 @@
extern volatile unsigned char *ioBase;

#if defined(linux) && defined(__powerpc64__)
-# include <asm/memory.h>
+/*# include <asm/memory.h>*/
#endif /* defined(linux) && defined(__powerpc64__) */
#ifndef eieio /* We deal with arch-specific eieio() routines above... */
# define eieio() __asm__ __volatile__ ("eieio" ::: "memory")
++++++ vnc-restart.patch ++++++
--- vnc-4_1-unixsrc/common/network/TcpSocket.cxx.restart 2005-03-04 09:02:21.000000000 +0000
+++ vnc-4_1-unixsrc/common/network/TcpSocket.cxx 2005-03-04 09:03:05.000000000 +0000
@@ -140,10 +140,14 @@
}

// Attempt to connect to the remote host
- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
- int e = errorNumber;
- closesocket(sock);
- throw SocketException("unable to connect to host", e);
+ for (;;) {
+ if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) {
+ int e = errorNumber;
+ if (e == EINTR)
+ continue;
+ closesocket(sock);
+ throw SocketException("unable to connect to host", e);
+ } else break;
}

// Disable Nagle's algorithm, to reduce latency
++++++ vnc-s390.patch ++++++
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c.s390 2005-09-19 19:38:26.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/linux/lnx_video.c 2005-12-21 12:29:17.000000000 +0000
@@ -64,7 +64,9 @@
#elif !defined(__powerpc__) && \
!defined(__mc68000__) && \
!defined(__sparc__) && \
- !defined(__mips__)
+ !defined(__mips__) && \
+ !defined(__s390__) && \
+ !defined(__s390x__)

/*
* Due to conflicts with "compiler.h", don't rely on <sys/io.h> to declare
@@ -569,7 +571,7 @@
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
@@ -596,7 +598,7 @@
#if defined(__powerpc__)
munmap(ioBase, 0x20000);
ioBase = NULL;
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
iopl(0);
ioperm(0, 1024, 0);
#endif
@@ -615,12 +617,12 @@
Bool
xf86DisableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1))
return (FALSE);
#endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) || defined(__s390x__)
#else
# ifdef __GNUC__
# if defined(__ia64__)
@@ -634,7 +636,7 @@
asm("cli");
# endif
#endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
@@ -647,12 +649,12 @@
void
xf86EnableInterrupts()
{
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
if (!ExtendedEnabled)
if (iopl(3) || ioperm(0, 1024, 1))
return;
#endif
-#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__)
+#if defined(__alpha__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__mips__) || defined(__arm__) || defined(__sh__) || defined(__ia64__) || defined(__hppa__) || defined(__s390__) || defined(__s390x__)
#else
# ifdef __GNUC__
# if defined(__ia64__)
@@ -666,7 +668,7 @@
asm("sti");
# endif
#endif
-#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__)
+#if !defined(__mc68000__) && !defined(__powerpc__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__ia64__) && !defined(__hppa__) && !defined(__s390__) && !defined(__s390x__)
if (!ExtendedEnabled) {
iopl(0);
ioperm(0, 1024, 0);
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2005-07-03 08:01:34.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/os-support/misc/SlowBcopy.c 2005-12-21 12:29:17.000000000 +0000
@@ -36,7 +36,9 @@
#if !defined(__sparc__) && \
!defined(__powerpc__) && \
!defined(__mips__) && \
- !defined(__ia64__)
+ !defined(__ia64__) && \
+ !defined(__s390__) && \
+ !defined(__s390x__)
outb(0x80, 0x00);
#endif
}
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am.s390 2005-12-02 06:02:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/int10/Makefile.am 2005-12-21 12:29:46.000000000 +0000
@@ -27,7 +27,8 @@
endif

if INT10_STUB
-AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) \
+ -I../common -I../os-support -I../os-support/bus
libint10_la_SOURCES = stub.c xf86int10module.c
endif

--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c.s390 2005-07-03 09:53:42.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Bus.c 2005-12-21 12:29:17.000000000 +0000
@@ -3078,7 +3078,7 @@
CheckGenericGA()
{
/* This needs to be changed for multiple domains */
-#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__)
+#if !defined(__sparc__) && !defined(__powerpc__) && !defined(__mips__) && !defined(__ia64__) && !defined(__s390__) && !defined(__s390x)
IOADDRESS GenericIOBase = VGAHW_GET_IOBASE();
CARD8 CurrentValue, TestValue;

--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c.s390 2005-07-03 09:53:42.000000000 +0100
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/xf86Helper.c 2005-12-21 12:29:17.000000000 +0000
@@ -2069,6 +2069,7 @@
void (*BlankScreen)(ScrnInfoPtr, Bool), IOADDRESS vertsyncreg,
int maskval, int knownclkindex, int knownclkvalue)
{
+#if !defined(__s390__) && !defined(__s390x__)
register int status = vertsyncreg;
unsigned long i, cnt, rcnt, sync;

@@ -2162,6 +2163,7 @@

/* Restore registers that were written on */
(*ClockFunc)(pScrn, CLK_REG_RESTORE);
+#endif /* !defined(__s390__) && !defined(__s390x__) */
}

void
--- vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h.s390 2005-11-08 06:33:28.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/xorg-server-1.0.0/hw/xfree86/common/compiler.h 2005-12-21 12:29:17.000000000 +0000
@@ -1355,6 +1355,15 @@
: "0" (_beg), "r" (_end), "r" (_flg)); \
} while (0)

+# elif defined(__s390__) || defined(__s390x__)
+
+#define inb(x) (0)
+#define inw(x) (0)
+#define inl(x) (0)
+#define outb(x,y) (0)
+#define outw(x,y) (0)
+#define outl(x,y) (0)
+
# else /* ix86 */

# define ldq_u(p) (*((unsigned long *)(p)))
++++++ vnc-select.patch ++++++
--- vnc-4_1_1-unixsrc/unix/x0vncserver/x0vncserver.cxx.select 2005-12-05 10:02:30.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/x0vncserver/x0vncserver.cxx 2005-12-05 10:02:32.000000000 +0000
@@ -302,6 +302,7 @@
fd_set rfds;
std::list<Socket*> sockets;
std::list<Socket*>::iterator i;
+ tv.tv_usec = tv.tv_sec = 0;

// Process any incoming X events
TXWindow::handleXEvents(dpy);
++++++ vnc-use-fb.patch ++++++
--- vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.use-fb 2005-02-28 12:59:09.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def 2005-03-04 16:13:19.000000000 +0000
@@ -1,35 +0,0 @@
-#define BuildServersOnly YES
-#define BuildFonts NO
-#define BuildClients NO
-#define BuildDocs NO
-#define BuildPexExt NO
-#define BuildNls NO
-#define BuildXIE NO
-#define BuildGlxExt NO
-#define XnestServer NO
-#define XprtServer NO
-
-#ifdef SunArchitecture
-#define ProjectRoot /usr/openwin
-#define HasGcc2 YES
-#define BuildXKB NO
-#endif
-
-#define HasFreetype2 NO
-#define BuildVNCExt YES
-#define VNCExtDefines -DVNCEXT
-#define SiteExtensionDefines VNCExtDefines
-#define SiteExtensionDirs vnc
-
-#define VncUnixDir $(TOP)/..
-#define VncCommonDir VncUnixDir/../common
-#define VncExtLibs VncCommonDir/rfb/librfb.a \
- VncCommonDir/Xregion/libXregion.a \
- VncCommonDir/network/libnetwork.a \
- VncCommonDir/rdr/librdr.a
-
-#define SiteExtensionLibs vnc/LibraryTargetName(vnc) VncExtLibs
-
-#define ServerTarget(server,subdirs,objects,libs,syslibs) @@\
-CCLINK = $(CXXENVSETUP) $(CXX) @@\
-ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
--- /dev/null 2005-02-24 13:02:34.848875488 +0000
+++ vnc-4_1-unixsrc/unix/xc/config/cf/vnc.def.in 2005-03-04 16:13:19.000000000 +0000
@@ -0,0 +1,37 @@
+#define BuildServersOnly YES
+#define BuildFonts NO
+#define BuildClients NO
+#define BuildDocs NO
+#define BuildPexExt NO
+#define BuildNls NO
+#define BuildXIE NO
+#define BuildGlxExt NO
+#define XnestServer NO
+#define XprtServer NO
+
+#ifdef SunArchitecture
+#define ProjectRoot /usr/openwin
+#define HasGcc2 YES
+#define BuildXKB NO
+#endif
+
+#define HasFreetype2 NO
+#define BuildVNCExt YES
+#define VNCExtDefines -DVNCEXT
+#define SiteExtensionDefines VNCExtDefines
+#define SiteExtensionDirs vnc
+
+#define VncUseFb @USE_FB@
+
+#define VncUnixDir $(TOP)/..
+#define VncCommonDir VncUnixDir/../common
+#define VncExtLibs VncCommonDir/rfb/librfb.a \
+ VncCommonDir/Xregion/libXregion.a \
+ VncCommonDir/network/libnetwork.a \
+ VncCommonDir/rdr/librdr.a
+
+#define SiteExtensionLibs vnc/LibraryTargetName(vnc) VncExtLibs
+
+#define ServerTarget(server,subdirs,objects,libs,syslibs) @@\
+CCLINK = $(CXXENVSETUP) $(CXX) @@\
+ServerTargetWithFlags(server,subdirs,objects,libs,syslibs,$(_NOOP_))
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile.use-fb 2004-12-01 17:27:58.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/Imakefile 2005-03-04 16:13:19.000000000 +0000
@@ -31,12 +31,19 @@
OBJS1 = os2_stubs.o
#endif

+#ifdef VncUseFb
+FB_DEFINES = -DVNC_USE_FB
+ FBINCLUDE = -I../../fb
+#else
+ FBINCLUDE = -I../../cfb
+#endif
+
SRCSA = xvnc.cc stubs.c $(SRCS1) miinitext.c $(SRCS2)

OBJSA = xvnc.o stubs.o $(OBJS1) miinitext.o $(OBJS2)

-INCLUDES = -I. -I.. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
- -I../../cfb -I../../mfb -I../../mi -I../../include -I../../os \
+INCLUDES = -I. -I.. -I$(XBUILDINCDIR) -I$(FONTINCSRC) $(FB_DEFINES) \
+ $(FBINCLUDE) -I../../mfb -I../../mi -I../../include -I../../os \
-I$(EXTINCSRC) -I$(XINCLUDESRC) -I$(SERVERSRC)/render $(VNCINCLUDE)

DEFINES = $(OS_DEFINES) $(SHMDEF) $(MMAPDEF) \
--- vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.use-fb 2005-02-28 12:59:09.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2005-03-04 16:13:19.000000000 +0000
@@ -48,8 +48,12 @@
#include "X11/Xos.h"
#include "scrnintstr.h"
#include "servermd.h"
+#ifdef VNC_USE_FB
+#include "fb.h"
+#else
#define PSZ 8
#include "cfb.h"
+#endif
#include "mi.h"
#include "mibstore.h"
#include "colormapst.h"
@@ -73,6 +77,7 @@
#undef public
#undef xor
#undef and
+#ifndef VNC_USE_FB
extern Bool cfb16ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
extern Bool cfb32ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
extern Bool cfb16CreateGC(GCPtr);
@@ -83,6 +88,7 @@
unsigned long, char*);
extern void cfb32GetImage(DrawablePtr, int, int, int, int, unsigned int,
unsigned long, char*);
+#endif
}

#define XVNCVERSION "Free Edition 4.1"
@@ -482,7 +488,7 @@
}
#endif

-
+#ifndef VNC_USE_FB
static Bool vfbMultiDepthCreateGC(GCPtr pGC)
{
switch (vfbBitsPerPixel(pGC->depth))
@@ -541,6 +547,7 @@
break;
}
}
+#endif

static ColormapPtr InstalledMaps[MAXSCREENS];

@@ -811,6 +818,11 @@
defaultColorVisualClass
= (pvfb->bitsPerPixel > 8) ? TrueColor : PseudoColor;

+#ifdef VNC_USE_FB
+ if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height,
+ dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel))
+ return FALSE;
+#else
switch (pvfb->bitsPerPixel)
{
case 1:
@@ -838,6 +850,7 @@
pScreen->CreateGC = vfbMultiDepthCreateGC;
pScreen->GetImage = vfbMultiDepthGetImage;
pScreen->GetSpans = vfbMultiDepthGetSpans;
+#endif

pScreen->InstallColormap = vfbInstallColormap;
pScreen->UninstallColormap = vfbUninstallColormap;
@@ -883,6 +896,9 @@
}
}

+#ifdef VNC_USE_FB
+ ret = fbCreateDefColormap(pScreen);
+#else
if (pvfb->bitsPerPixel == 1)
{
ret = mfbCreateDefColormap(pScreen);
@@ -891,6 +907,7 @@
{
ret = cfbCreateDefColormap(pScreen);
}
+#endif

miSetZeroLineBias(pScreen, pvfb->lineBias);

--- vnc-4_1-unixsrc/unix/configure.in.use-fb 2005-01-11 16:37:17.000000000 +0000
+++ vnc-4_1-unixsrc/unix/configure.in 2005-03-04 16:13:19.000000000 +0000
@@ -65,6 +65,18 @@
AC_SUBST(ZLIB_INCLUDE)
AC_SUBST(ZLIB_LIB)

+AC_ARG_WITH(fb,
+[ --with-fb use the new 'fb' framebuffer implementation])
+if test "$with_installed_zlib" = yes; then
+ echo "using 'fb' framebuffer"
+ USE_FB=YES
+else
+ echo "using 'mfb' and 'cfb' framebuffer"
+ USE_FB=NO
+fi
+
+AC_SUBST(USE_FB)
+
BOILERPLATE=boilerplate.mk

if (sh -c "make --version" 2>/dev/null | grep GNU 2>&1 >/dev/null); then
@@ -79,4 +91,5 @@
vncviewer/Makefile:common.mk:vncviewer/Makefile.in:$BOILERPLATE \
vncconfig/Makefile:common.mk:vncconfig/Makefile.in:$BOILERPLATE \
vncpasswd/Makefile:common.mk:vncpasswd/Makefile.in:$BOILERPLATE \
+ xc/config/cf/vnc.def \
)
--- vnc-4_1-unixsrc/unix/xc.patch.use-fb 2004-12-01 11:33:15.000000000 +0000
+++ vnc-4_1-unixsrc/unix/xc.patch 2005-03-04 16:19:31.000000000 +0000
@@ -2,7 +2,7 @@
--- xc/programs/Xserver/Imakefile Fri Jun 6 11:14:39 2003
***************
*** 409,412 ****
---- 409,429 ----
+--- 409,435 ----
#endif
#endif /* XsunServer */
+ XCOMM
@@ -13,12 +13,18 @@
+ CFB16DIR = cfb16
+ CFB24DIR = cfb24
+ CFB32DIR = cfb32
++ FBDIR = fb
+ XVNCDDXDIR = vnc/Xvnc
++ #if VncUseFb
++ XVNCDIRS = $(STDDIRS) $(FBDIR) $(XVNCDDXDIR) $(DEPDIRS)
++ XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) FbPostFbLibs
++ #else
+ XVNCDIRS = $(STDDIRS) $(MFBDIR) \
+ $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+ $(XVNCDDXDIR) $(DEPDIRS)
-+ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
+ XVNCLIBS = PreFbLibs vnc/Xvnc/LibraryTargetName(xvnc) CFBLibs PostFbLibs
++ #endif
++ XVNCOBJS = $(XVNCDDXDIR)/stubs.o $(XVNCDDXDIR)/miinitext.o
+ XVNCSYSLIBS = $(FONTLIBS) $(SYSLIBS)
+ ServerTarget(Xvnc,$(XVNCDIRS),$(XVNCOBJS), \
+ $(LIBCWRAPPER) $(XVNCLIBS) $(LOADABLEEXTS),$(XVNCSYSLIBS))
++++++ vnc-via.patch ++++++
--- vnc-4_1-unixsrc/unix/vncviewer/vncviewer.cxx.via 2005-03-03 23:20:33.000000000 +0000
+++ vnc-4_1-unixsrc/unix/vncviewer/vncviewer.cxx 2005-03-03 23:23:33.000000000 +0000
@@ -41,6 +41,7 @@

using namespace network;
using namespace rfb;
+using namespace std;

IntParameter pointerEventInterval("PointerEventInterval",
"Time in milliseconds to rate-limit"
@@ -95,6 +96,9 @@
StringParameter geometry("geometry", "X geometry specification", "");
StringParameter displayname("display", "The X display", "");

+/* Support for tunnelling */
+StringParameter via("via", "Gateway to tunnel via", "");
+
char aboutText[256];
char* programName;
extern char buildtime[];
@@ -157,6 +161,61 @@
exit(1);
}

+/* Tunnelling support. */
+static void
+interpretViaParam (char **gatewayHost, char **remoteHost,
+ int *remotePort, char **vncServerName,
+ int localPort)
+{
+ const int SERVER_PORT_OFFSET = 5900;
+ char *pos = strchr (*vncServerName, ':');
+ if (pos == NULL)
+ *remotePort = SERVER_PORT_OFFSET;
+ else {
+ int portOffset = SERVER_PORT_OFFSET;
+ size_t len;
+ *pos++ = '\0';
+ len = strlen (pos);
+ if (*pos == ':') {
+ /* Two colons is an absolute port number, not an offset. */
+ pos++;
+ len--;
+ portOffset = 0;
+ }
+ if (!len || strspn (pos, "-0123456789") != len )
+ usage ();
+ *remotePort = atoi (pos) + portOffset;
+ }
+
+ if (**vncServerName != '\0')
+ *remoteHost = *vncServerName;
+
+ *gatewayHost = strDup (via.getValueStr ());
+ *vncServerName = new char[50];
+ sprintf (*vncServerName, "localhost::%d", localPort);
+}
+
+static void
+createTunnel (const char *gatewayHost, const char *remoteHost,
+ int remotePort, int localPort)
+{
+ char *cmd = getenv ("VNC_VIA_CMD");
+ char *percent;
+ char lport[10], rport[10];
+ sprintf (lport, "%d", localPort);
+ sprintf (rport, "%d", remotePort);
+ setenv ("G", gatewayHost, 1);
+ setenv ("H", remoteHost, 1);
+ setenv ("R", rport, 1);
+ setenv ("L", lport, 1);
+ if (!cmd)
+ cmd = "/usr/bin/ssh -f -L \"$L\":\"$H\":\"$R\" \"$G\" sleep 20";
+ /* Compatibility with TightVNC's method. */
+ while ((percent = strchr (cmd, '%')) != NULL)
+ *percent = '$';
+ system (cmd);
+}
+
int main(int argc, char** argv)
{
sprintf(aboutText, "VNC Viewer Free Edition 4.1 for X - built %s\n"
@@ -190,8 +249,6 @@
usage();
}

- if (vncServerName)
- usage();
vncServerName = argv[i];
}

@@ -207,6 +264,19 @@
vlog.error("Could not create .vnc directory: environment variable $HOME not set.");

try {
+ /* Tunnelling support. */
+ if (strlen (via.getValueStr ()) > 0) {
+ char *gatewayHost = "";
+ char *remoteHost = "localhost";
+ int localPort = findFreeTcpPort ();
+ int remotePort;
+ if (!vncServerName)
+ usage();
+ interpretViaParam (&gatewayHost, &remoteHost, &remotePort,
+ &vncServerName, localPort);
+ createTunnel (gatewayHost, remoteHost, remotePort, localPort);
+ }
+
Socket* sock = 0;

if (listenMode) {
--- vnc-4_1-unixsrc/unix/vncviewer/vncviewer.man.via 2005-03-03 23:23:41.000000000 +0000
+++ vnc-4_1-unixsrc/unix/vncviewer/vncviewer.man 2005-03-03 23:24:18.000000000 +0000
@@ -174,6 +174,23 @@
specified as an X11 keysym name (these can be obtained by removing the XK_
prefix from the entries in "/usr/include/X11/keysymdef.h"). Default is F8.

+.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
+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.
+"localhost" denotes the \fIgateway\fR, not the machine where vncviewer
+was launched. The environment variable \fIVNC_VIA_CMD\fR can override
+the default tunnel command of
+\fB/usr/bin/ssh\ -f\ -L\ "$L":"$H":"$R"\ "$G"\ sleep\ 20\fR. The tunnel
+command is executed with the environment variables \fIL\fR, \fIH\fR,
+\fIR\fR, and \fIG\fR taken the values of the local port number, the remote
+host, the port number on the remote host, and the gateway machine
+respectively.
+
.SH SEE ALSO
.BR Xvnc (1),
.BR vncpasswd (1),
--- vnc-4_1-unixsrc/common/network/TcpSocket.cxx.via 2005-03-03 23:17:55.000000000 +0000
+++ vnc-4_1-unixsrc/common/network/TcpSocket.cxx 2005-03-03 23:19:49.000000000 +0000
@@ -54,6 +54,29 @@

static rfb::LogWriter vlog("TcpSocket");

+/* Tunnelling support. */
+int network::findFreeTcpPort (void)
+{
+ int sock, port;
+ struct sockaddr_in addr;
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_addr.s_addr = INADDR_ANY;
+
+ if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
+ throw SocketException ("unable to create socket", errorNumber);
+
+ for (port = TUNNEL_PORT_OFFSET + 99; port > TUNNEL_PORT_OFFSET; port--) {
+ addr.sin_port = htons ((unsigned short) port);
+ if (bind (sock, (struct sockaddr *)&addr, sizeof (addr)) == 0) {
+ close (sock);
+ return port;
+ }
+ }
+ throw SocketException ("no free port in range", 0);
+ return 0;
+}
+

// -=- Socket initialisation
static bool socketsInitialised = false;
--- vnc-4_1-unixsrc/common/network/TcpSocket.h.via 2005-03-03 23:19:58.000000000 +0000
+++ vnc-4_1-unixsrc/common/network/TcpSocket.h 2005-03-03 23:20:21.000000000 +0000
@@ -32,8 +32,14 @@

#include <list>

+/* Tunnelling support. */
+#define TUNNEL_PORT_OFFSET 5500
+
namespace network {

+ /* Tunnelling support. */
+ int findFreeTcpPort (void);
+
class TcpSocket : public Socket {
public:
TcpSocket(int sock, bool close=true);
++++++ vnc-viewer-reparent.patch ++++++
--- vnc-4_1_1-unixsrc/unix/tx/TXWindow.h.viewer-reparent 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/tx/TXWindow.h 2005-12-01 17:55:38.000000000 +0000
@@ -183,6 +183,9 @@

Display* const dpy;

+ TXEventHandler* eventHandler;
+ long eventMask;
+
int xPad, yPad, bevel;

private:
@@ -195,9 +198,7 @@
TXWindow* parent;
Window win_;
int width_, height_;
- TXEventHandler* eventHandler;
TXDeleteWindowCallback* dwc;
- long eventMask;
XSizeHints sizeHints;
std::map<Atom,Time> selectionOwnTime;
std::map<Atom,bool> selectionOwner_;
--- vnc-4_1_1-unixsrc/unix/tx/TXViewport.cxx.viewer-reparent 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/tx/TXViewport.cxx 2005-12-01 17:55:38.000000000 +0000
@@ -43,6 +43,21 @@
delete vScrollbar;
}

+void TXViewport::reparent(long embed_window)
+{
+ XReparentWindow(dpy, win(), (Window)embed_window, 0, 0);
+ XSelectInput(dpy, embed_window, child->eventMask);
+ if (!eventHandler)
+ this->setEventHandler(this);
+}
+
+void TXViewport::handleEvent(TXWindow* w, XEvent* ev)
+{
+ if (child && child->eventHandler)
+ ((TXEventHandler *)child->eventHandler)->handleEvent(child, ev);
+}
+
+
void TXViewport::setChild(TXWindow* child_)
{
child = child_;
--- vnc-4_1_1-unixsrc/unix/tx/TXViewport.h.viewer-reparent 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/tx/TXViewport.h 2005-12-01 17:55:38.000000000 +0000
@@ -32,8 +32,8 @@
#include "TXWindow.h"
#include "TXScrollbar.h"

-class TXViewport : public TXWindow, public TXScrollbarCallback,
- public rfb::Timer::Callback {
+class TXViewport : public TXWindow, public TXScrollbarCallback,
+ public TXEventHandler, public rfb::Timer::Callback {
public:
TXViewport(Display* dpy_, int width, int height, TXWindow* parent_=0);
virtual ~TXViewport();
@@ -59,6 +59,12 @@
// normally.
bool bumpScrollEvent(XMotionEvent* ev);

+ // reparent the viewport into a new window
+ void reparent(long embed_window);
+
+ // event handler
+ void handleEvent(TXWindow* w, XEvent* ev);
+
private:
virtual void resizeNotify();
virtual void scrollbarPos(int x, int y, TXScrollbar* sb);
--- vnc-4_1_1-unixsrc/unix/vncviewer/parameters.h.viewer-reparent 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/vncviewer/parameters.h 2005-12-01 17:55:38.000000000 +0000
@@ -37,6 +37,7 @@
extern rfb::BoolParameter sendPrimary;
extern rfb::BoolParameter fullScreen;
extern rfb::StringParameter geometry;
+extern rfb::StringParameter embedParent;

extern char aboutText[];
extern char* programName;
--- vnc-4_1_1-unixsrc/unix/vncviewer/CConn.cxx.viewer-reparent 2005-03-11 15:08:41.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/vncviewer/CConn.cxx 2005-12-01 17:55:38.000000000 +0000
@@ -586,10 +586,18 @@

void CConn::reconfigureViewport()
{
+ const char * par = embedParent.getValueStr();
viewport->setMaxSize(cp.width, cp.height);
if (fullScreen) {
viewport->resize(DisplayWidth(dpy,DefaultScreen(dpy)),
DisplayHeight(dpy,DefaultScreen(dpy)));
+ } else if (strlen(par) != 0) {
+ XWindowAttributes win_attr;
+ Window w = strtol(par, (char **)NULL, 0);
+
+ XGetWindowAttributes(dpy, w, &win_attr);
+ viewport->reparent(w);
+ viewport->resize(win_attr.width, win_attr.height);
} else {
int w = cp.width;
int h = cp.height;
--- vnc-4_1_1-unixsrc/unix/vncviewer/vncviewer.cxx.viewer-reparent 2005-12-01 17:54:46.000000000 +0000
+++ vnc-4_1_1-unixsrc/unix/vncviewer/vncviewer.cxx 2005-12-01 17:55:38.000000000 +0000
@@ -99,6 +99,9 @@
/* Support for tunnelling */
StringParameter via("via", "Gateway to tunnel via", "");

+/* Support for reparenting */
+StringParameter embedParent("Parent", "X Window to use as a parent", "");
+
char aboutText[256];
char* programName;
extern char buildtime[];
++++++ vnc-vncpasswd.patch ++++++
--- vnc-4_1_1-unixsrc/common/rfb/Password.cxx.vncpasswd 2005-06-27 15:08:30.000000000 +0100
+++ vnc-4_1_1-unixsrc/common/rfb/Password.cxx 2005-06-27 15:18:28.000000000 +0100
@@ -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");
--- vnc-4_1_1-unixsrc/common/rfb/Password.h.vncpasswd 2005-06-27 15:18:46.000000000 +0100
+++ vnc-4_1_1-unixsrc/common/rfb/Password.h 2005-06-27 15:18:56.000000000 +0100
@@ -28,6 +28,7 @@
public:
PlainPasswd();
PlainPasswd(char* pwd);
+ PlainPasswd(int l);
PlainPasswd(const ObfuscatedPasswd& obfPwd);
~PlainPasswd();
void replaceBuf(char* b);
++++++ vnc-xclients.patch ++++++
--- vnc-4_1-unixsrc/unix/vncserver.xclients 2005-03-03 23:01:16.000000000 +0000
+++ vnc-4_1-unixsrc/unix/vncserver 2005-03-03 23:02:26.000000000 +0000
@@ -42,6 +42,10 @@

$defaultXStartup
= ("#!/bin/sh\n\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".

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >
This Thread