diff --git a/.cvsignore b/.gitignore similarity index 52% rename from .cvsignore rename to .gitignore index 6e2b3b3..43f5d82 100644 --- a/.cvsignore +++ b/.gitignore @@ -1,2 +1 @@ vnc-4_1_2-unixsrc.tar.gz -vnc-4_1-javasrc.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index 3e94b2b..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Makefile for source rpm: vnc -# $Id$ -NAME := vnc -SPECFILE = $(firstword $(wildcard *.spec)) - -include ../common/Makefile.common diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..aaf29be --- /dev/null +++ b/dead.package @@ -0,0 +1,2 @@ +RealVNC has been replaced by TightVNC. Checkout "tightvnc" module if you want +current Fedora source. diff --git a/sources b/sources deleted file mode 100644 index 741660b..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz -9407ce1f215aefca77bef12670745280 vnc-4_1-javasrc.tar.gz diff --git a/vnc-102434.patch b/vnc-102434.patch deleted file mode 100644 index 0272ac2..0000000 --- a/vnc-102434.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- 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", - "Password file for VNC authentication", ""); -+BoolParameter passwdInput("passwdInput", "Gets password from stdin", false); - AliasParameter rfbauth("passwd", "Alias for PasswordFile", &passwordFile); - - BoolParameter useLocalCursor("UseLocalCursor", ---- 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". - - .TP -+.B \-passwdInput \fItrue, false\fP -+Force standard vnc dialog to getting password and reads password from stdin. -+Default is false(shows dialog window) -+ -+.TP - .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 -+#include - - 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); diff --git a/vnc-16x16.png b/vnc-16x16.png deleted file mode 100644 index 37efe6d..0000000 Binary files a/vnc-16x16.png and /dev/null differ diff --git a/vnc-210617.patch b/vnc-210617.patch deleted file mode 100644 index b242048..0000000 --- a/vnc-210617.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.ipv6 2006-10-13 11:31:37.000000000 +0100 -+++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2006-10-13 12:05:40.000000000 +0100 -@@ -106,11 +106,29 @@ - TcpSocket::TcpSocket(const char *host, int port) - : closeFd(true) - { -+ struct sockaddr_storage addr; -+ size_t addrlen; -+ struct addrinfo *hostai; - int sock; - -- // - Create a socket - initSockets(); -- if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) -+ -+ if (getaddrinfo(host, NULL, NULL, &hostai)) { -+ int e = errorNumber; -+ throw SocketException("unable to resolve host by name", e); -+ } -+ -+ addrlen = hostai->ai_addrlen; -+ memset(&addr, 0, sizeof(addr)); -+ memcpy(&addr, hostai->ai_addr, addrlen); -+ freeaddrinfo(hostai); -+ if (addr.ss_family == AF_INET) -+ ((struct sockaddr_in *)&addr)->sin_port = htons(port); -+ else if (addr.ss_family == AF_INET6) -+ ((struct sockaddr_in6 *)&addr)->sin6_port = htons(port); -+ -+ // - Create a socket -+ if ((sock = socket(addr.ss_family, SOCK_STREAM, 0)) < 0) - throw SocketException("unable to create socket", errorNumber); - - #ifndef WIN32 -@@ -118,30 +136,9 @@ - fcntl(sock, F_SETFD, FD_CLOEXEC); - #endif - -- // - Connect it to something -- -- // Try processing the host as an IP address -- struct sockaddr_in addr; -- memset(&addr, 0, sizeof(addr)); -- addr.sin_family = AF_INET; -- addr.sin_addr.s_addr = inet_addr(host); -- addr.sin_port = htons(port); -- if ((int)addr.sin_addr.s_addr == -1) { -- // Host was not an IP address - try resolving as DNS name -- struct hostent *hostinfo; -- hostinfo = gethostbyname(host); -- if (hostinfo && hostinfo->h_addr) { -- addr.sin_addr.s_addr = ((struct in_addr *)hostinfo->h_addr)->s_addr; -- } else { -- int e = errorNumber; -- closesocket(sock); -- throw SocketException("unable to resolve host by name", e); -- } -- } -- - // Attempt to connect to the remote host - for (;;) { -- if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) != 0) { -+ if (connect(sock, (struct sockaddr *)&addr, addrlen) != 0) { - int e = errorNumber; - if (e == EINTR) - continue; - diff --git a/vnc-24x24.png b/vnc-24x24.png deleted file mode 100644 index dadbb79..0000000 Binary files a/vnc-24x24.png and /dev/null differ diff --git a/vnc-48x48.png b/vnc-48x48.png deleted file mode 100644 index 1e9ef45..0000000 Binary files a/vnc-48x48.png and /dev/null differ diff --git a/vnc-64bit.patch b/vnc-64bit.patch deleted file mode 100644 index 34b2d6d..0000000 --- a/vnc-64bit.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- 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 - #include - -+#include "xorg-server.h" -+ - extern "C" { - #define class c_class; - #include ---- 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 */ diff --git a/vnc-always_use_fb.patch b/vnc-always_use_fb.patch deleted file mode 100644 index b9e49d0..0000000 --- a/vnc-always_use_fb.patch +++ /dev/null @@ -1,210 +0,0 @@ ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.always_use_fb 2007-03-05 14:03:21.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-05 14:10:57.000000000 +0100 -@@ -33,27 +33,28 @@ - #include - #include "vncExtInit.h" - -+#ifdef HAVE_DIX_CONFIG_H -+#include -+#endif -+ - extern "C" { - #define class c_class - #define public c_public -+#define new c_new - #ifdef WIN32 - #include - #endif - #include --#include "X11/X.h" -+#include - #define NEED_EVENTS --#include "X11/Xproto.h" --#include "X11/Xos.h" -+#include -+#include - #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 "micmap.h" -+#include "miline.h" - #include "colormapst.h" - #include "gcstruct.h" - #include "input.h" -@@ -66,24 +67,12 @@ - #endif - #include - #include "dix.h" --#include "miline.h" - #include "inputstr.h" - #include "keysym.h" - extern int defaultColorVisualClass; -+#undef new - #undef class - #undef public --#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); -- extern Bool cfb32CreateGC(GCPtr); -- extern void cfb16GetSpans(DrawablePtr, int, DDXPointPtr, int*, int, char*); -- extern void cfb32GetSpans(DrawablePtr, int, DDXPointPtr, int*, int, char*); -- extern void cfb16GetImage(DrawablePtr, int, int, int, int, unsigned int, -- unsigned long, char*); -- extern void cfb32GetImage(DrawablePtr, int, int, int, int, unsigned int, -- unsigned long, char*); --#endif - } - - #define XVNCVERSION "Free Edition 4.1.2" -@@ -502,67 +491,6 @@ - } - #endif - --#ifndef VNC_USE_FB --static Bool vfbMultiDepthCreateGC(GCPtr pGC) --{ -- switch (vfbBitsPerPixel(pGC->depth)) -- { -- case 1: return mfbCreateGC (pGC); -- case 8: return cfbCreateGC (pGC); -- case 16: return cfb16CreateGC (pGC); -- case 32: return cfb32CreateGC (pGC); -- default: return FALSE; -- } --} -- --static void vfbMultiDepthGetSpans( -- DrawablePtr pDrawable, /* drawable from which to get bits */ -- int wMax, /* largest value of all *pwidths */ -- register DDXPointPtr ppt, /* points to start copying from */ -- int *pwidth, /* list of number of bits to copy */ -- int nspans, /* number of scanlines to copy */ -- char *pdstStart) /* where to put the bits */ --{ -- switch (pDrawable->bitsPerPixel) { -- case 1: -- mfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart); -- break; -- case 8: -- cfbGetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart); -- break; -- case 16: -- cfb16GetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart); -- break; -- case 32: -- cfb32GetSpans(pDrawable, wMax, ppt, pwidth, nspans, pdstStart); -- break; -- } -- return; --} -- --static void --vfbMultiDepthGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h, -- unsigned int format, unsigned long planeMask, -- char *pdstLine) --{ -- switch (pDrawable->bitsPerPixel) -- { -- case 1: -- mfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -- break; -- case 8: -- cfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -- break; -- case 16: -- cfb16GetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -- break; -- case 32: -- cfb32GetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -- break; -- } --} --#endif -- - static ColormapPtr InstalledMaps[MAXSCREENS]; - - static int vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) -@@ -832,44 +760,32 @@ - 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; -+ miSetPixmapDepths(); - --#ifdef RENDER -- if (ret && Render) -- fbPictureInit(pScreen, 0, 0); --#endif /* RENDER */ --#else /* VNC_USE_FB */ - switch (pvfb->bitsPerPixel) - { -- case 1: -- ret = mfbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, -- dpi, dpi, pvfb->paddedWidth); -- break; - case 8: -- ret = cfbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, -- dpi, dpi, pvfb->paddedWidth); -+ miSetVisualTypesAndMasks (8, 1 << PseudoColor, 8, PseudoColor, 0, 0, 0); -+ - break; - case 16: -- ret = cfb16ScreenInit(pScreen, pbits, pvfb->width, pvfb->height, -- dpi, dpi, pvfb->paddedWidth); -+ miSetVisualTypesAndMasks (16, 1 << TrueColor, 8, TrueColor, 0xf800, 0x07e0, 0x001f); - break; - case 32: -- ret = cfb32ScreenInit(pScreen, pbits, pvfb->width, pvfb->height, -- dpi, dpi, pvfb->paddedWidth); -+ miSetVisualTypesAndMasks (32, 1 << TrueColor , 8, TrueColor, 0xff000000, 0x00ff0000, 0x0000ff00); - break; - default: - return FALSE; - } - -- if (!ret) return FALSE; -+ if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, -+ dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) -+ return FALSE; - -- pScreen->CreateGC = vfbMultiDepthCreateGC; -- pScreen->GetImage = vfbMultiDepthGetImage; -- pScreen->GetSpans = vfbMultiDepthGetSpans; --#endif -+#ifdef RENDER -+ if (ret && Render) -+ fbPictureInit(pScreen, 0, 0); -+#endif /* RENDER */ - - pScreen->InstallColormap = vfbInstallColormap; - pScreen->UninstallColormap = vfbUninstallColormap; -@@ -915,18 +831,7 @@ - } - } - --#ifdef VNC_USE_FB - ret = fbCreateDefColormap(pScreen); --#else -- if (pvfb->bitsPerPixel == 1) -- { -- ret = mfbCreateDefColormap(pScreen); -- } -- else -- { -- ret = cfbCreateDefColormap(pScreen); -- } --#endif - - miSetZeroLineBias(pScreen, pvfb->lineBias); - diff --git a/vnc-authentication.patch b/vnc-authentication.patch deleted file mode 100644 index 2bbaf3d..0000000 --- a/vnc-authentication.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- vnc-4_1_1-unixsrc/common/rfb/SConnection.cxx.authentication 2005-03-11 16:08:41.000000000 +0100 -+++ vnc-4_1_1-unixsrc/common/rfb/SConnection.cxx 2006-05-17 16:15:54.000000000 +0200 -@@ -181,6 +181,15 @@ - vlog.info("Client requests security type %s(%d)", - secTypeName(secType),secType); - -+ // Verify that the requested security type should be offered -+ std::list secTypes; -+ std::list::iterator i; -+ securityFactory->getSecTypes(&secTypes, reverseConnection); -+ for (i=secTypes.begin(); i!=secTypes.end(); i++) -+ if (*i == secType) break; -+ if (i == secTypes.end()) -+ throw Exception("Requested security type not available"); -+ - try { - state_ = RFBSTATE_SECURITY; - security = securityFactory->getSSecurity(secType, reverseConnection); diff --git a/vnc-autotools-compile.patch b/vnc-autotools-compile.patch deleted file mode 100644 index 523d878..0000000 --- a/vnc-autotools-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx.autotools-compile 2007-02-15 18:56:52.000000000 +0100 -+++ vnc-4_1_2-unixsrc/common/network/TcpSocket.cxx 2007-02-15 18:57:21.000000000 +0100 -@@ -42,7 +42,7 @@ - #include - - #ifndef VNC_SOCKLEN_T --#define VNC_SOCKLEN_T int -+#define VNC_SOCKLEN_T socklen_t - #endif - - #ifndef INADDR_NONE diff --git a/vnc-autotools.patch b/vnc-autotools.patch deleted file mode 100644 index ff1c42c..0000000 --- a/vnc-autotools.patch +++ /dev/null @@ -1,444 +0,0 @@ ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,5 @@ -+SUBDIRS = \ -+ rdr \ -+ network \ -+ Xregion \ -+ rfb ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/rfb/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,136 @@ -+lib_LTLIBRARIES = librfb.la -+ -+librfb_la_SOURCES = \ -+ Blacklist.cxx \ -+ Blacklist.h \ -+ CConnection.cxx \ -+ CConnection.h \ -+ CMsgHandler.cxx \ -+ CMsgHandler.h \ -+ CMsgReader.cxx \ -+ CMsgReader.h \ -+ CMsgReaderV3.cxx \ -+ CMsgReaderV3.h \ -+ CMsgWriter.cxx \ -+ CMsgWriter.h \ -+ CMsgWriterV3.cxx \ -+ CMsgWriterV3.h \ -+ ColourCube.h \ -+ ColourMap.h \ -+ ComparingUpdateTracker.cxx \ -+ ComparingUpdateTracker.h \ -+ Configuration.cxx \ -+ Configuration.h \ -+ ConnParams.cxx \ -+ ConnParams.h \ -+ CSecurity.h \ -+ CSecurityNone.h \ -+ CSecurityVncAuth.cxx \ -+ CSecurityVncAuth.h \ -+ Cursor.cxx \ -+ Cursor.h \ -+ Decoder.cxx \ -+ Decoder.h \ -+ d3des.c \ -+ d3des.h \ -+ Encoder.cxx \ -+ Encoder.h \ -+ encodings.cxx \ -+ encodings.h \ -+ Exception.h \ -+ hextileConstants.h \ -+ hextileDecode.h \ -+ HextileDecoder.cxx \ -+ HextileDecoder.h \ -+ hextileEncode.h \ -+ HextileEncoder.cxx \ -+ HextileEncoder.h \ -+ Hostname.h \ -+ HTTPServer.cxx \ -+ HTTPServer.h \ -+ ImageGetter.h \ -+ InputHandler.h \ -+ KeyRemapper.cxx \ -+ KeyRemapper.h \ -+ keysymdef.h \ -+ Logger.cxx \ -+ Logger_file.cxx \ -+ Logger_file.h \ -+ Logger.h \ -+ Logger_stdio.cxx \ -+ Logger_stdio.h \ -+ LogWriter.cxx \ -+ LogWriter.h \ -+ msgTypes.h \ -+ Password.cxx \ -+ Password.h \ -+ PixelBuffer.cxx \ -+ PixelBuffer.h \ -+ PixelFormat.cxx \ -+ PixelFormat.h \ -+ Pixel.h \ -+ RawDecoder.cxx \ -+ RawDecoder.h \ -+ RawEncoder.cxx \ -+ RawEncoder.h \ -+ Rect.h \ -+ Region.cxx \ -+ Region.h \ -+ rreDecode.h \ -+ RREDecoder.cxx \ -+ RREDecoder.h \ -+ rreEncode.h \ -+ RREEncoder.cxx \ -+ RREEncoder.h \ -+ SConnection.cxx \ -+ SConnection.h \ -+ SDesktop.h \ -+ secTypes.cxx \ -+ secTypes.h \ -+ ServerCore.cxx \ -+ ServerCore.h \ -+ SMsgHandler.cxx \ -+ SMsgHandler.h \ -+ SMsgReader.cxx \ -+ SMsgReader.h \ -+ SMsgReaderV3.cxx \ -+ SMsgReaderV3.h \ -+ SMsgWriter.cxx \ -+ SMsgWriter.h \ -+ SMsgWriterV3.cxx \ -+ SMsgWriterV3.h \ -+ SSecurityFactoryStandard.cxx \ -+ SSecurityFactoryStandard.h \ -+ SSecurity.h \ -+ SSecurityNone.h \ -+ SSecurityVncAuth.cxx \ -+ SSecurityVncAuth.h \ -+ Threading.h \ -+ Timer.cxx \ -+ Timer.h \ -+ TransImageGetter.cxx \ -+ TransImageGetter.h \ -+ transInitTempl.h \ -+ transTempl.h \ -+ TrueColourMap.h \ -+ UpdateTracker.cxx \ -+ UpdateTracker.h \ -+ UserPasswdGetter.h \ -+ util.cxx \ -+ util.h \ -+ VNCSConnectionST.cxx \ -+ VNCSConnectionST.h \ -+ VNCServer.h \ -+ VNCServerST.cxx \ -+ VNCServerST.h \ -+ zrleDecode.h \ -+ ZRLEDecoder.cxx \ -+ ZRLEDecoder.h \ -+ zrleEncode.h \ -+ ZRLEEncoder.cxx \ -+ ZRLEEncoder.h -+ -+librfb_la_LIBADD = \ -+ $(top_srcdir)/network/libnetwork.la \ -+ $(top_srcdir)/rdr/librdr.la \ -+ $(top_srcdir)/Xregion/libXregion.la ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/rdr/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,30 @@ -+noinst_LTLIBRARIES = librdr.la -+ -+librdr_la_SOURCES = \ -+ Exception.cxx \ -+ FdInStream.h \ -+ FixedMemOutStream.h \ -+ HexOutStream.cxx \ -+ InStream.h \ -+ OutStream.h \ -+ SubstitutingInStream.h \ -+ ZlibInStream.h \ -+ Exception.h \ -+ FdOutStream.cxx \ -+ HexInStream.cxx \ -+ HexOutStream.h \ -+ MemInStream.h \ -+ RandomStream.cxx \ -+ types.h \ -+ ZlibOutStream.cxx \ -+ FdInStream.cxx \ -+ FdOutStream.h \ -+ HexInStream.h \ -+ InStream.cxx \ -+ MemOutStream.h \ -+ RandomStream.h \ -+ ZlibInStream.cxx \ -+ ZlibOutStream.h -+ -+librdr_la_LIBADD = \ -+ -lz ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/configure.ac 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,42 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ(2.61) -+AC_INIT([vnc-libs], 4.1.2, [bugzilla.redhat.com]) -+AC_CONFIG_HEADER([config.h]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_CC -+AC_PROG_LIBTOOL -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_HEADER_STDC -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h unistd.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_HEADER_STDBOOL -+AC_C_CONST -+AC_C_INLINE -+AC_TYPE_SIZE_T -+AC_HEADER_TIME -+AC_STRUCT_TM -+ -+# Checks for library functions. -+AC_FUNC_ERROR_AT_LINE -+AC_FUNC_MEMCMP -+AC_FUNC_SELECT_ARGTYPES -+AC_TYPE_SIGNAL -+AC_FUNC_STRFTIME -+AC_FUNC_VPRINTF -+AC_CHECK_FUNCS([ftime gethostbyname getpass gettimeofday inet_ntoa memchr memmove memset select socket strcasecmp strchr strerror strncasecmp]) -+ -+AC_CONFIG_FILES([Makefile -+ Xregion/Makefile -+ network/Makefile -+ rdr/Makefile -+ rfb/Makefile]) -+AC_OUTPUT ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/Xregion/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,6 @@ -+noinst_LTLIBRARIES = libXregion.la -+ -+libXregion_la_SOURCES = \ -+ Region.c \ -+ region.h \ -+ Xregion.h ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/common/network/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,6 @@ -+noinst_LTLIBRARIES = libnetwork.la -+ -+libnetwork_la_SOURCES = \ -+ Socket.h \ -+ TcpSocket.cxx \ -+ TcpSocket.h ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,6 @@ -+SUBDIRS = \ -+ tx \ -+ vncpasswd \ -+ vncviewer \ -+ vncconfig \ -+ x0vncserver ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/tx/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,25 @@ -+noinst_LTLIBRARIES = libtx.la -+ -+libtx_la_SOURCES = \ -+ TXButton.h \ -+ TXDialog.h \ -+ TXEntry.h \ -+ TXCheckbox.h \ -+ TXImage.cxx \ -+ TXImage.h \ -+ TXLabel.h \ -+ TXMenu.cxx \ -+ TXMenu.h \ -+ TXMsgBox.h \ -+ TXScrollbar.cxx \ -+ TXScrollbar.h \ -+ TXViewport.cxx \ -+ TXViewport.h \ -+ TXWindow.cxx \ -+ TXWindow.h -+ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/../common/ -+ -+libtx_la_LIBADD = \ -+ -lX11 ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/vncpasswd/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,10 @@ -+bin_PROGRAMS = vncpasswd -+ -+vncpasswd_SOURCES = \ -+ vncpasswd.cxx -+ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/../common -+ -+vncpasswd_LDADD = \ -+ $(top_srcdir)/../common/rfb/librfb.la ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/vncconfig/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,17 @@ -+bin_PROGRAMS = vncconfig -+ -+vncconfig_SOURCES = \ -+ buildtime.c \ -+ QueryConnectDialog.cxx \ -+ QueryConnectDialog.h \ -+ vncconfig.cxx \ -+ vncExt.c \ -+ vncExt.h -+ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/../common \ -+ -I$(top_srcdir)/tx -+ -+vncconfig_LDADD = \ -+ $(top_srcdir)/../common/rfb/librfb.la \ -+ $(top_srcdir)/tx/libtx.la ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/configure.ac 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,52 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ(2.61) -+AC_INIT([vnc], 4.1.2, [bugzilla.redhat.com]) -+AC_CONFIG_SRCDIR([x0vncserver/buildtime.c]) -+AC_CONFIG_HEADER([config.h]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+ -+# Checks for programs. -+AC_PROG_CXX -+AC_PROG_CC -+AC_PROG_LIBTOOL -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_PATH_X -+AC_HEADER_STDC -+AC_HEADER_SYS_WAIT -+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h strings.h sys/time.h termios.h unistd.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_HEADER_STDBOOL -+AC_C_CONST -+AC_C_INLINE -+AC_C_RESTRICT -+AC_TYPE_SIZE_T -+AC_HEADER_TIME -+ -+# Checks for library functions. -+AC_FUNC_ERROR_AT_LINE -+AC_FUNC_FORK -+AC_FUNC_LSTAT -+AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK -+AC_FUNC_MALLOC -+AC_FUNC_MEMCMP -+AC_FUNC_REALLOC -+AC_FUNC_SELECT_ARGTYPES -+AC_TYPE_SIGNAL -+AC_FUNC_STAT -+AC_FUNC_VPRINTF -+AC_FUNC_WAIT3 -+AC_CHECK_FUNCS([memset mkdir select setenv strchr strdup strerror strspn strtol]) -+ -+AC_CONFIG_FILES([Makefile -+ tx/Makefile -+ vncconfig/Makefile -+ vncpasswd/Makefile -+ vncviewer/Makefile -+ x0vncserver/Makefile]) -+AC_OUTPUT ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am.autotools 2007-02-16 09:52:43.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-02-16 09:53:24.000000000 +0100 -@@ -42,10 +42,7 @@ - ../xfree86/common/libcommon.la \ - -lX11 \ - libvnccommon.la \ -- ../../../../common/rfb/librfb.a \ -- ../../../../common/rdr/librdr.a \ -- ../../../../common/network/libnetwork.a \ -- ../../../../common/Xregion/libXregion.a -+ ../../../../common/rfb/librfb.la - - Xvnc_CFLAGS = -DHAVE_DIX_CONFIG_H \ - -DNO_HW_ONLY_EXTS \ -@@ -68,10 +65,7 @@ - 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 -+ ../../../../common/rfb/librfb.la - libvnc_la_CXXFLAGS = \ - -I../../../../common \ - -I$(top_srcdir)/hw/xfree86/common \ ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/vncviewer/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,24 @@ -+bin_PROGRAMS = vncviewer -+ -+vncviewer_SOURCES = \ -+ AboutDialog.h \ -+ buildtime.c \ -+ CConn.cxx \ -+ CConn.h \ -+ DesktopWindow.cxx \ -+ DesktopWindow.h \ -+ InfoDialog.h \ -+ OptionsDialog.h \ -+ parameters.h \ -+ PasswdDialog.h \ -+ ServerDialog.h \ -+ vncviewer.cxx -+ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/../common \ -+ -I$(top_srcdir)/tx -+ -+vncviewer_LDADD = \ -+ $(top_srcdir)/../common/rfb/librfb.la \ -+ $(top_srcdir)/tx/libtx.la \ -+ -lXext ---- /dev/null 2007-02-16 09:39:42.585819347 +0100 -+++ vnc-4_1_2-unixsrc/unix/x0vncserver/Makefile.am 2007-02-16 09:51:11.000000000 +0100 -@@ -0,0 +1,20 @@ -+bin_PROGRAMS = x0vncserver -+ -+x0vncserver_SOURCES = \ -+ buildtime.c \ -+ Image.cxx \ -+ Image.h \ -+ x0vncserver.cxx \ -+ $(top_srcdir)/vncconfig/QueryConnectDialog.h \ -+ $(top_srcdir)/vncconfig/QueryConnectDialog.cxx -+ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/../common \ -+ -I$(top_srcdir)/vncconfig \ -+ -I$(top_srcdir)/tx -+ -+x0vncserver_LDADD = \ -+ $(top_srcdir)/../common/rfb/librfb.la \ -+ $(top_srcdir)/tx/libtx.la \ -+ -lXext \ -+ -lXtst diff --git a/vnc-config.patch b/vnc-config.patch deleted file mode 100644 index 026b2ba..0000000 --- a/vnc-config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc.config 2006-10-25 12:35:00.000000000 +0200 -+++ vnc-4_1_1-unixsrc/unix/xc/programs/Xserver/vnc/vncExtInit.cc 2006-10-25 12:35:24.000000000 +0200 -@@ -17,6 +17,7 @@ - */ - - #include -+#include "XserverDesktop.h" - - extern "C" { - #define class c_class -@@ -48,7 +49,6 @@ - #undef min - #include - --#include "XserverDesktop.h" - #include "vncHooks.h" - #include "vncExtInit.h" - diff --git a/vnc-cookie.patch b/vnc-cookie.patch deleted file mode 100644 index d653f3a..0000000 --- a/vnc-cookie.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- 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'}; diff --git a/vnc-fPIC.patch b/vnc-fPIC.patch deleted file mode 100644 index 3ffb77d..0000000 --- a/vnc-fPIC.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- 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@ diff --git a/vnc-gcc4.patch b/vnc-gcc4.patch deleted file mode 100644 index 5228b8c..0000000 --- a/vnc-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); diff --git a/vnc-idle.patch b/vnc-idle.patch deleted file mode 100644 index 411672f..0000000 --- a/vnc-idle.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 " diff --git a/vnc-modular-xorg.patch b/vnc-modular-xorg.patch deleted file mode 100644 index 2278120..0000000 --- a/vnc-modular-xorg.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c.modular-xorg 2007-03-02 15:45:37.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/mi/miinitext.c 2007-03-02 15:45:38.000000000 +0100 -@@ -283,6 +283,9 @@ - #ifdef MITMISC - extern void MITMiscExtensionInit(INITARGS); - #endif -+#ifdef VNCEXT -+extern void vncExtensionInit(INITARGS); -+#endif - #ifdef XIDLE - extern void XIdleExtensionInit(INITARGS); - #endif -@@ -561,6 +564,9 @@ - #ifdef MITMISC - if (!noMITMiscExtension) MITMiscExtensionInit(); - #endif -+#ifdef VNCEXT -+ vncExtensionInit(); -+#endif - #ifdef XIDLE - if (!noXIdleExtension) XIdleExtensionInit(); - #endif ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am.modular-xorg 2007-03-02 15:45:38.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/Makefile.am 2007-03-02 15:47:10.000000000 +0100 -@@ -30,6 +30,8 @@ - XPRINT_SUBDIRS = xprint - endif - -+XVNC_SUBDIRS = vnc -+ - # need to add darwin support here - - SUBDIRS = \ -@@ -39,6 +41,7 @@ - $(XVFB_SUBDIRS) \ - $(XNEST_SUBDIRS) \ - $(DMX_SUBDIRS) \ -+ $(XVNC_SUBDIRS) \ - $(KDRIVE_SUBDIRS) \ - $(XPRINT_SUBDIRS) - ---- /dev/null 2007-03-01 10:25:08.783929433 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/vnc/Makefile.am 2007-03-02 15:45:38.000000000 +0100 -@@ -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-x11-server-source/configure.ac.modular-xorg 2007-03-02 15:45:38.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/configure.ac 2007-03-02 15:45:38.000000000 +0100 -@@ -1793,6 +1793,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/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.modular-xorg 2007-03-02 15:45:38.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:45:38.000000000 +0100 -@@ -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 - #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; diff --git a/vnc-module_crash.patch b/vnc-module_crash.patch deleted file mode 100644 index da7c412..0000000 --- a/vnc-module_crash.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc.module_crash 2007-03-26 20:00:49.000000000 +0200 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/vncHooks.cc 2007-03-26 20:05:20.000000000 +0200 -@@ -509,7 +509,12 @@ - BoxRec box; - PictureScreenPtr ps = GetPictureScreen(pScreen); - -- if ((xDst >= 0) && (yDst >= 0)) { -+ ps->Composite = vncHooksScreen->Composite; -+ (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc, -+ xMask, yMask, xDst, yDst, width, height); -+ ps->Composite = vncHooksComposite; -+ -+ if((xDst >= 0) && (yDst >= 0) && pDst->pDrawable->type == DRAWABLE_WINDOW) { - box.x1 = pDst->pDrawable->x + xDst; - box.y1 = pDst->pDrawable->y + yDst; - box.x2 = box.x1 + width; -@@ -518,11 +523,6 @@ - RegionHelper changed(pScreen, &box, 0); - vncHooksScreen->desktop->add_changed(changed.reg); - } -- -- ps->Composite = vncHooksScreen->Composite; -- (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc, -- xMask, yMask, xDst, yDst, width, height); -- ps->Composite = vncHooksComposite; - } - - #endif /* RENDER */ diff --git a/vnc-newfbsize.patch b/vnc-newfbsize.patch deleted file mode 100644 index be0b11d..0000000 --- a/vnc-newfbsize.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) diff --git a/vnc-nohttpd.patch b/vnc-nohttpd.patch deleted file mode 100644 index 3bf9632..0000000 --- a/vnc-nohttpd.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 " . "edString($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 [:] [-name ] [-depth ]\n". -+ die("\nusage: $prog [:] [-nohttpd] [-name ] [-depth ]\n". - " [-geometry x]\n". - " [-pixelformat rgbNNN|bgrNNN]\n". - " ...\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 diff --git a/vnc-ppc64.patch b/vnc-ppc64.patch deleted file mode 100644 index f473ad3..0000000 --- a/vnc-ppc64.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.ppc64 2006-11-14 16:10:58.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h 2006-11-14 16:14:11.000000000 +0100 -@@ -1081,7 +1081,7 @@ - #if defined(linux) && defined(__powerpc64__) - # include - # if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) --# include -+/*# include */ - # endif - #endif /* defined(linux) && defined(__powerpc64__) */ - #ifndef eieio /* We deal with arch-specific eieio() routines above... */ diff --git a/vnc-render.patch b/vnc-render.patch deleted file mode 100644 index 678cf90..0000000 --- a/vnc-render.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- 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 2007-03-02 15:56:06.000000000 +0100 -@@ -29,6 +29,9 @@ - #include "regionstr.h" - #include "dixfontstr.h" - #include "colormapst.h" -+#ifdef RENDER -+#include "../../render/picturestr.h" -+#endif - - #ifdef GC_HAS_COMPOSITE_CLIP - #define COMPOSITE_CLIP(gc) ((gc)->pCompositeClip) -@@ -74,6 +77,9 @@ - StoreColorsProcPtr StoreColors; - DisplayCursorProcPtr DisplayCursor; - ScreenBlockHandlerProcPtr BlockHandler; -+#ifdef RENDER -+ CompositeProcPtr Composite; -+#endif - } vncHooksScreenRec, *vncHooksScreenPtr; - - typedef struct { -@@ -104,6 +110,13 @@ - static Bool vncHooksDisplayCursor(ScreenPtr pScreen, CursorPtr cursor); - static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, - pointer pReadmask); -+#ifdef RENDER -+static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, -+ PicturePtr pDst, INT16 xSrc, INT16 ySrc, -+ INT16 xMask, INT16 yMask, INT16 xDst, INT16 yDst, -+ CARD16 width, CARD16 height); -+#endif -+ - - // GC "funcs" - -@@ -229,6 +242,13 @@ - vncHooksScreen->StoreColors = pScreen->StoreColors; - vncHooksScreen->DisplayCursor = pScreen->DisplayCursor; - vncHooksScreen->BlockHandler = pScreen->BlockHandler; -+#ifdef RENDER -+ PictureScreenPtr ps; -+ ps = GetPictureScreenIfSet(pScreen); -+ if (ps) { -+ vncHooksScreen->Composite = ps->Composite; -+ } -+#endif - - pScreen->CloseScreen = vncHooksCloseScreen; - pScreen->CreateGC = vncHooksCreateGC; -@@ -241,6 +261,11 @@ - pScreen->StoreColors = vncHooksStoreColors; - pScreen->DisplayCursor = vncHooksDisplayCursor; - pScreen->BlockHandler = vncHooksBlockHandler; -+#ifdef RENDER -+ if (ps) { -+ ps->Composite = vncHooksComposite; -+ } -+#endif - - return TRUE; - } -@@ -470,6 +495,38 @@ - SCREEN_REWRAP(BlockHandler); - } - -+// Composite - needed for RENDER -+ -+#ifdef RENDER -+void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, -+ PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, -+ INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, -+ CARD16 height) -+{ -+ ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ vncHooksScreenPtr vncHooksScreen = \ -+ ((vncHooksScreenPtr)pScreen->devPrivates[vncHooksScreenIndex].ptr); -+ BoxRec box; -+ PictureScreenPtr ps = GetPictureScreen(pScreen); -+ -+ if ((xDst >= 0) && (yDst >= 0)) { -+ box.x1 = pDst->pDrawable->x + xDst; -+ box.y1 = pDst->pDrawable->y + yDst; -+ box.x2 = box.x1 + width; -+ box.y2 = box.y1 + height; -+ -+ RegionHelper changed(pScreen, &box, 0); -+ vncHooksScreen->desktop->add_changed(changed.reg); -+ } -+ -+ ps->Composite = vncHooksScreen->Composite; -+ (*ps->Composite)(op, pSrc, pMask, pDst, xSrc, ySrc, -+ xMask, yMask, xDst, yDst, width, height); -+ ps->Composite = vncHooksComposite; -+} -+ -+#endif /* RENDER */ -+ - - - ///////////////////////////////////////////////////////////////////////////// ---- vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.render 2007-03-02 15:56:06.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc 2007-03-02 15:56:37.000000000 +0100 -@@ -130,6 +130,7 @@ - static Bool vfbPixmapDepths[33]; - static char needswap = 0; - static int lastScreen = -1; -+static Bool Render = TRUE; - - static bool displaySpecified = false; - static bool wellKnownSocketsCreated = false; -@@ -221,6 +222,10 @@ - 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 -+ ErrorF("+/-render turn on/off RENDER extension support" -+ "(default on)\n"); -+#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"); -@@ -317,6 +322,20 @@ - return ret; - } - -+#ifdef RENDER -+ if (strcmp (argv[i], "+render") == 0) /* +render */ -+ { -+ Render = TRUE; -+ return 1; -+ } -+ -+ if (strcmp (argv[i], "-render") == 0) /* -render */ -+ { -+ Render = FALSE; -+ return 1; -+ } -+#endif -+ - if (strcmp (argv[i], "-blackpixel") == 0) /* -blackpixel n */ - { - Pixel pix; -@@ -817,7 +836,12 @@ - if (!fbScreenInit(pScreen, pbits, pvfb->width, pvfb->height, - dpi, dpi, pvfb->paddedWidth, pvfb->bitsPerPixel)) - return FALSE; --#else -+ -+#ifdef RENDER -+ if (ret && Render) -+ fbPictureInit(pScreen, 0, 0); -+#endif /* RENDER */ -+#else /* VNC_USE_FB */ - switch (pvfb->bitsPerPixel) - { - case 1: -@@ -938,6 +962,19 @@ - vfbPixmapDepths[vfbScreens[i].depth] = TRUE; - } - -+#ifdef RENDER -+ /* RENDER needs a good set of pixmaps. */ -+ if (Render) { -+ vfbPixmapDepths[1] = TRUE; -+ vfbPixmapDepths[4] = TRUE; -+ vfbPixmapDepths[8] = TRUE; -+/* vfbPixmapDepths[15] = TRUE; */ -+ vfbPixmapDepths[16] = TRUE; -+ vfbPixmapDepths[24] = TRUE; -+ vfbPixmapDepths[32] = TRUE; -+ } -+#endif -+ - for (i = 1; i <= 32; i++) - { - if (vfbPixmapDepths[i]) diff --git a/vnc-restart.patch b/vnc-restart.patch deleted file mode 100644 index 976cc59..0000000 --- a/vnc-restart.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 diff --git a/vnc-s390.patch b/vnc-s390.patch deleted file mode 100644 index 1003cac..0000000 --- a/vnc-s390.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am.s390 2007-03-01 12:22:04.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/int10/Makefile.am 2007-03-01 12:34:20.000000000 +0100 -@@ -38,7 +38,8 @@ - endif - - if INT10_STUB --AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) -+AM_CFLAGS = $(I386_VIDEO_CFLAGS) -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_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h.s390 2007-03-01 12:22:04.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/compiler.h 2007-03-01 12:22:04.000000000 +0100 -@@ -1353,6 +1353,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-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c.s390 2007-03-01 12:22:04.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/common/xf86Helper.c 2007-03-01 12:22:04.000000000 +0100 -@@ -2089,6 +2089,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; - -@@ -2182,6 +2183,7 @@ - - /* Restore registers that were written on */ - (*ClockFunc)(pScrn, CLK_REG_RESTORE); -+#endif /* !defined(__s390__) && !defined(__s390x__) */ - } - - _X_EXPORT void ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c.s390 2007-03-01 12:22:04.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/linux/lnx_video.c 2007-03-01 12:29:36.000000000 +0100 -@@ -62,7 +62,8 @@ - #elif !defined(__powerpc__) && \ - !defined(__mc68000__) && \ - !defined(__sparc__) && \ -- !defined(__mips__) -+ !defined(__mips__) && \ -+ !defined(__s390__) - - /* - * Due to conflicts with "compiler.h", don't rely on to declare -@@ -567,7 +568,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__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno == ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n"); ---- vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c.s390 2007-03-01 12:22:04.000000000 +0100 -+++ vnc-4_1_2-unixsrc/unix/xorg-x11-server-source/hw/xfree86/os-support/misc/SlowBcopy.c 2007-03-01 12:22:04.000000000 +0100 -@@ -35,7 +35,9 @@ - #if !defined(__sparc__) && \ - !defined(__powerpc__) && \ - !defined(__mips__) && \ -- !defined(__ia64__) -+ !defined(__ia64__) && \ -+ !defined(__s390__) && \ -+ !defined(__s390x__) - outb(0x80, 0x00); - #endif - } diff --git a/vnc-select.patch b/vnc-select.patch deleted file mode 100644 index b888071..0000000 --- a/vnc-select.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 sockets; - std::list::iterator i; -+ tv.tv_usec = tv.tv_sec = 0; - - // Process any incoming X events - TXWindow::handleXEvents(dpy); diff --git a/vnc-use-fb.patch b/vnc-use-fb.patch deleted file mode 100644 index 55eddd0..0000000 --- a/vnc-use-fb.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- 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); diff --git a/vnc-via.patch b/vnc-via.patch deleted file mode 100644 index 6554427..0000000 --- a/vnc-via.patch +++ /dev/null @@ -1,186 +0,0 @@ ---- 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 - -+/* 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); diff --git a/vnc-viewer-reparent.patch b/vnc-viewer-reparent.patch deleted file mode 100644 index 5c5ff23..0000000 --- a/vnc-viewer-reparent.patch +++ /dev/null @@ -1,115 +0,0 @@ ---- 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 selectionOwnTime; - std::map 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[]; diff --git a/vnc-vncpasswd.patch b/vnc-vncpasswd.patch deleted file mode 100644 index ca94d59..0000000 --- a/vnc-vncpasswd.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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); diff --git a/vnc-vsnprintf.patch b/vnc-vsnprintf.patch deleted file mode 100644 index 8abe7d0..0000000 --- a/vnc-vsnprintf.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- vnc-4_1_2-unixsrc/common/rfb/Logger.cxx.vsnprintf 2007-02-26 12:29:25.000000000 +0100 -+++ vnc-4_1_2-unixsrc/common/rfb/Logger.cxx 2007-02-26 12:30:03.000000000 +0100 -@@ -34,7 +34,7 @@ - - using namespace rfb; - --#ifndef HAVE_VSNPRINTF -+/*#ifndef HAVE_VSNPRINTF - #ifdef __RFB_THREADING_IMPL - static Mutex fpLock; - #endif -@@ -63,7 +63,7 @@ - return len; - } - #endif -- -+*/ - - Logger* Logger::loggers = 0; - diff --git a/vnc-xclients.patch b/vnc-xclients.patch deleted file mode 100644 index eff6ca3..0000000 --- a/vnc-xclients.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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". diff --git a/vnc.spec b/vnc.spec deleted file mode 100644 index 2920a9b..0000000 --- a/vnc.spec +++ /dev/null @@ -1,754 +0,0 @@ -%define vnc_version 4_1_2 -%define java_vnc_version 4_1 - -Summary: A remote display system -Name: vnc -Version: 4.1.2 -Release: 17%{?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 -Source2: vncserver.init -Source3: vnc-16x16.png -Source4: vnc-24x24.png -Source5: 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 -Patch8: vnc-restart.patch -Patch9: vnc-vncpasswd.patch -Patch11: vnc-modular-xorg.patch -Patch12: vnc-nohttpd.patch -Patch14: vnc-s390.patch -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 -Patch25: vnc-config.patch -Patch28: vnc-render.patch -Patch31: vnc-autotools.patch -Patch32: vnc-autotools-compile.patch -Patch33: vnc-always_use_fb.patch -Patch34: vnc-vsnprintf.patch -Patch35: vnc-module_crash.patch -License: GPL -Group: User Interface/Desktops -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: perl -BuildRequires: zlib-devel libjpeg-devel -BuildRequires: desktop-file-utils >= 0.2.92 -BuildRequires: gcc-java -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: libXt-devel -BuildRequires: libstdc++-devel, gcc-c++, libselinux-devel -BuildRequires: xorg-x11-server-source -BuildRequires: mesa-libGL-devel >= 6.5.2, mesa-source >= 6.5.2, libdrm-devel - -Requires: gtk2 >= 2.6 -Requires: coreutils -Requires: vnc-libs - -%description -Virtual Network Computing (VNC) is a remote display system which -allows you to view a computing 'desktop' environment not only on the -machine where it is running, but from anywhere on the Internet and -from a wide variety of machine architectures. This package contains a -client which will allow you to connect to other desktops running a VNC -server. - -%package server -Summary: A VNC server -Requires: bash >= 2.0, util-linux, xorg-x11-fonts-base, xorg-x11-xauth, chkconfig -Requires: vnc-libs -Group: User Interface/X - -%description server -The VNC system allows you to access the same desktop from a wide -variety of platforms. This package is a VNC server, allowing others -to access the desktop on your machine. - -%package libs -Summary: VNC Remote framebuffer libraries -Group: User Interface/X - -%description libs -Remote framebuffer library which is used by vncviewer and vncserver - -%prep -%setup -q -n vnc-%{vnc_version}-unixsrc -a1 -cp -r %{_datadir}/xorg-x11-server-source unix -%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 -%patch8 -p1 -b .restart -%patch9 -p1 -b .vncpasswd -%patch11 -p1 -b .modular-xorg -%patch12 -p1 -b .nohttpd -pushd unix/xorg-x11-server-source* -%patch14 -p3 -b .s390 -popd -%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 -%patch25 -p1 -b .config -%patch28 -p1 -b .render -%patch31 -p1 -b .autotools -%patch32 -p1 -b .autotools-compile -%patch33 -p1 -b .always_use_fb -%patch34 -p1 -b .vsnprintf -%patch35 -p1 -b .module_crash - -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-x11-server-source/hw/vnc/ -cp -a unix/xorg-x11-server-source/{cfb/cfb.h,hw/vnc} -cp -a unix/xorg-x11-server-source/{fb/fb.h,hw/vnc} -cp -a unix/xorg-x11-server-source/{fb/fbrop.h,hw/vnc} -sed -i -e 's,xor,c_xor,' -e 's,and,c_and,' \ - unix/xorg-x11-server-source/hw/vnc/{cfb,fb,fbrop}.h - -%build -cd common -autoreconf --install --force -%configure -make %{?_smp_mflags} - -cd ../vnc-%{java_vnc_version}-javasrc/java -make JAVAC="gcj -C" JAR=fastjar %{?_smp_mflags} - -cd ../../unix -autoreconf --install --force -%configure -make %{?_smp_mflags} - -cd xorg-x11-server-source -aclocal; automake -a; autoconf -%configure --enable-xorg --disable-xnest --disable-xvfb \ - --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \ - --with-pic \ - --disable-xorgcfg \ - --disable-xprint \ - --disable-static \ - --enable-composite \ - --enable-xtrap \ - --enable-xcsecurity \ - --with-default-font-path="unix/:7100,built-ins" \ - --with-fontdir=%{_datadir}/X11/fonts \ - --with-os-name="Fedora Core 7" \ - --with-os-vendor="Red Hat, Inc." \ - --with-xkb-output=%{_localstatedir}/lib/xkb \ - --with-rgb-path=%{_datadir}/X11/rgb \ - --enable-install-libxf86config \ - --disable-xevie \ - --disable-dri \ - --enable-glx \ - --with-mesa-source=%{_datadir}/mesa/source - -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT - -cd common; -make install DESTDIR=$RPM_BUILD_ROOT - -cd ../unix - -mandst=$RPM_BUILD_ROOT%{_mandir}/man1 -mkdir -p $mandst -for f in xorg-x11-server-source/hw/vnc/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd \ - vncconfig/vncconfig vncserver x0vncserver/x0vncserver; do - - cp -pf $f.man $mandst/`basename $f.1` - chmod 0444 $mandst/`basename $f.1` -done -make install DESTDIR=$RPM_BUILD_ROOT -cp vncserver $RPM_BUILD_ROOT/usr/bin - -cd xorg-x11-server-source/hw/vnc -make install DESTDIR=$RPM_BUILD_ROOT -cd ../../../ - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/vnc/classes -cp -a ../vnc-%{java_vnc_version}-javasrc/java/{index.vnc,logo150x150.gif,vncviewer.jar} $RPM_BUILD_ROOT%{_datadir}/vnc/classes - -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -install -m755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/vncserver - -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig -cat > $RPM_BUILD_ROOT/etc/sysconfig/vncservers << "EOF" -# The VNCSERVERS variable is a list of display:user pairs. -# -# Uncomment the lines below to start a VNC server on display :2 -# as my 'myusername' (adjust this to your own). You will also -# need to set a VNC password; run 'man vncpasswd' to see how -# to do that. -# -# DO NOT RUN THIS SERVICE if your local area network is -# untrusted! For a secure way of using VNC, see -# . - -# Use "-nolisten tcp" to prevent X connections to your VNC server via TCP. - -# Use "-nohttpd" to prevent web-based VNC clients connecting. - -# Use "-localhost" to prevent remote VNC clients connecting except when -# doing so through a secure tunnel. See the "-via" option in the -# `man vncviewer' manual page. - -# VNCSERVERS="2:myusername" -# VNCSERVERARGS[2]="-geometry 800x600 -nolisten tcp -nohttpd -localhost" -EOF -chmod 644 $RPM_BUILD_ROOT/etc/sysconfig/vncservers - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps -install %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/vnc.png -install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/vnc.png -install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/vnc.png -mkdir -p $RPM_BUILD_ROOT/etc/X11/applnk/Applications -cat > vncviewer.desktop << EOF -[Desktop Entry] -Encoding=UTF-8 -Name=VNC Viewer -Comment=Connect to VNC server and display remote desktop -Exec=/usr/bin/vncviewer -Icon=vnc.png -Terminal=false -Type=Application -StartupWMClass=VNC Viewer: Connection Details -EOF -# Desktop file installation. -mkdir $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --vendor vnc --delete-original \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Red-Hat-Extra \ - --add-category Network \ - --add-category Application \ - vncviewer.desktop - -# removing unwanted files -rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.a -rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.la -rm -f $RPM_BUILD_ROOT%{_libdir}/librfb.so -rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ] && [ -f %{_datadir}/icons/hicolor/index.theme ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi - -%postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x /usr/bin/gtk-update-icon-cache ] && [ -f %{_datadir}/icons/hicolor/index.theme ]; then - gtk-update-icon-cache -q %{_datadir}/icons/hicolor -fi - -%post server -if [ "$1" = 1 ]; then - /sbin/chkconfig --add vncserver -fi - -%preun server -if [ "$1" = 0 ]; then - /sbin/service vncserver stop >/dev/null 2>&1 - /sbin/chkconfig --del vncserver -fi - -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - -%files -%defattr(-,root,root) -%doc LICENCE.txt README -%{_bindir}/vncviewer -%{_datadir}/applications/* -%{_mandir}/man1/vncviewer.1* -%{_datadir}/icons/hicolor/*/*/* - -%files server -%defattr(-,root,root) -%attr(0755,root,root) %config /etc/rc.d/init.d/vncserver -%config(noreplace) /etc/sysconfig/vncservers -%{_bindir}/Xvnc -%{_bindir}/vncpasswd -%{_bindir}/vncconfig -%{_bindir}/vncserver -%{_bindir}/x0vncserver -%{_datadir}/vnc -%{_mandir}/man1/Xvnc.1* -%{_mandir}/man1/vncpasswd.1* -%{_mandir}/man1/vncconfig.1* -%{_mandir}/man1/vncserver.1* -%{_mandir}/man1/x0vncserver.1* -%{_libdir}/xorg/modules/extensions/libvnc.so - -%files libs -%defattr(-,root,root) -%{_libdir}/librfb.so.* - -%changelog -* Mon Apr 23 2007 Adam Tkac 4.1.2-17.fc7 -- removed patch to #188169 because patching this bug could do - more things bad than good -- removed int10 module from vnc (with-int10 option) - -* Tue Mar 27 2007 Adam Tkac 4.1.2-16.fc7 -- fixed vnc module crashing (#234124) -- vncviewer has been moved from Utility group to Network group (#231765) - -* Mon Mar 05 2007 Adam Tkac 4.1.2-15.fc7 -- improved vnc-always_use_fb patch (some screen defects on 64bits) -- removed xserver tarball from source list - -* Fri Mar 02 2007 Adam Tkac 4.1.2-14.fc7 -- enabled RENDER, Composite and GLX extensions by default on all architectures -- new relation between Xvnc and xorg's source. Xvnc now uses latest xorg's sources - from xorg-x11-server-source package -- fired away obsolete patches - - vnc-mesa-6.5.2.patch - - vnc-mesa.patch - - vnc-selinux.patch - - vnc-render-sigfault.patch - - vnc-fontpath.patch - - vnc-null-interface.patch - -* Mon Feb 26 2007 Adam Tkac 4.1.2-13.fc7 -- remove wild implementation of vsnprintf (this caused sigfaults on 64bits) (#229702) -- added post & postun sections to vnc-libs -- menu tooltip is HIG compliant (#229941) -- specfile has been standardized (checked by rpmlint) - -* Fri Feb 23 2007 Adam Tkac 4.1.2-12.fc7 -- new colormap policy in Xvnc -- Xvnc now always use framebuffer (like Xvfb) -- obsolete patches have been removed - -* Wed Feb 16 2007 Adam Tkac 4.1.2-11.fc7 -- major build-process changes in vnc - - vnc is now completely built by autotools -- new package (vnc-libs) contains remote framebuffer library - and vncviewer and server is linked against this -- specfile cleanup - -* Mon Jan 15 2007 Adam Tkac 4.1.2-10.fc7 -- fixed render crashing when run in 8bpp - -* Mon Jan 08 2007 Adam Tkac 4.1.2-9.fc7 -- enable render extensions by default on s390 & s390x - -* Wed Dec 13 2006 Adam Tkac 4.1.2-8.1.fc7 -- changed __ppc64__ to __ppc__ in vnc-render.patch - all powerpc has render enabled by default, other archs no - -* Mon Dec 11 2006 Adam Tkac 4.1.2-8.fc7 -- fixed building against mesa-6.5.2 - -* Tue Dec 05 2006 Adam Tkac 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 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 - -* Thu Nov 23 2006 Adam Tkac 4.1.2-7.fc7 -- Xvnc now starts with render extensions. We need test it. Disable with -render option -- vncserver requires xorg-x11-xauth - -* Tue Nov 14 2006 Adam Tkac 4.1.2-6.fc7 -- update to xorg-x11-server to version 1.1.1 -- fixed OpenGL extensions (#213215) -- fixed vnc-188169.patch (#213609) -- fixed RENDER problems (#162304) -- build requires libstdc++-devel and gcc-c++, autoconf213 and libselinux-devel - -* Wed Oct 25 2006 Adam Tkac 4.1.2-5 -- added xorg-x11-fonts-base dependency -- fixed vncconfig crash on x64 (#179635) - -* Tue Oct 17 2006 Adam Tkac 4.1.2-4 -- IPv6 support to vncviewer has been added (#210617) -- fixed conflict between "locate pointer" option in control-center - and vncviewer (#188169) -- fixed software group of vnc (#209229) -- added support to get password from stdin (#102434) - -* Mon Jul 18 2006 Jitka Kudrnacova 4.1.2-3 -- vncviewer now supports NewFBSize pseudoencoding (#180939) -- do not BuildRequire libdrm-devel on s390, s390x, ppc64 it is not available there - -* Tue Jun 13 2006 Jeremy Katz 4.1.2-2 -- update xorg-x11-server to 1.1.0 to fix crashes in anaconda - -* Fri May 26 2006 Jitka Kudrnacova 4.1.2-1 -- enable OpenGL support - -* Thu May 25 2006 Jitka Kudrnacova 4.1.2-0.1 -- fixed building on ppc64 - -* Thu May 18 2006 Jitka Kudrnacova 4.1.2-0 -- update to version 4.1.2 - -* Wed May 10 2006 Jitka Kudrnacova 4.1.1-38 -- fixed crash of Xnvc caused by a NULL pointer in interfaces (bug #187607) -- This also fixes crash of Xvnc when vpnc is running (bug #187069) -- don't build on ppc64 due to intermittent build problems - -* Fri Apr 21 2006 Jitka Kudrnacova 4.1.1-37 -- removed liblbxutil-devel from BuildRequires - -* Tue Feb 28 2006 Jitka Kudrnacova 4.1.1-36 -- with default cofiguration, /etc/init.d/vncserver start will say - "no displays configured" (bug #182161) - -* Fri Feb 10 2006 Jesse Keating - 4.1.1-35.1 -- bump again for double-long bug on ppc(64) - -* Wed Feb 08 2006 Jitka Kudrnacova 4.1.1-35 -- Add a test for existence of index.theme before calling - gtk-update-icon-cache in post-(un)installation script, - bug #179704 - -* Tue Feb 07 2006 Jesse Keating - 4.1.1-34.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Tue Jan 31 2006 Tim Waugh 4.1.1-34 -- Updated xorg-x11-server to 1.0.1-1. - -* Tue Jan 3 2006 Tim Waugh 4.1.1-33 -- Use VNC-provided Xregion (bug #176435). -- Prevent restorecon error message when not present (bug #176654). - -* Fri Dec 23 2005 Tim Waugh 4.1.1-32 -- Use system libtool to fix libvnc.so build (bug #176435). - -* Wed Dec 21 2005 Tim Waugh 4.1.1-31 -- Rebase on xorg-x11-server-1.0.0-2. - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Dec 8 2005 Tim Waugh 4.1.1-30 -- Enable Xdmcp (bug #175298). - -* Thu Dec 8 2005 Tim Waugh 4.1.1-29 -- Fix x0vncserver (bug #172410). - -* Tue Dec 6 2005 Tim Waugh 4.1.1-28 -- Enable all the extensions, which were accidentally disabled. - -* Tue Dec 6 2005 Tim Waugh 4.1.1-27 -- Fix 64-bit server (bug #174702). -- Build requires freetype-devel. -- Build requires libXext-devel, libXtst-devel, automake, libtool, pkgconfig, - libfontenc-devel, xorg-x11-util-macros. - -* Thu Dec 1 2005 Tim Waugh 4.1.1-26 -- Apply patch to allow vncviewer window reparenting (bug #174640). -- Build again on s390/s390x (bug #174569). - -* Thu Dec 1 2005 Tim Waugh 4.1.1-25 -- Actually initialise the vnc extension in Xvnc. -- Disable lbx. - -* Thu Dec 1 2005 Tim Waugh 4.1.1-24 -- Build X extension module again. -- Install X extension module into modules/ directory. -- Remove xscreensaver patch, since it causes badness. - -* Fri Nov 25 2005 Tim Waugh 4.1.1-23 -- ExcludeArch s390 s390x (see bug #174569). -- Re-base on modular xorg-x11 (bug #173323). -- Build requires modular X things. - -* Fri Nov 18 2005 Tim Waugh 4.1.1-22 -- Extension module is not available on all architectures. - -* Fri Nov 18 2005 Tim Waugh 4.1.1-21 -- Install extension module into the correct directory. - -* Fri Nov 18 2005 Tim Waugh 4.1.1-20 -- Fix font path correctly (bug #173160). - -* Wed Nov 16 2005 Tim Waugh 4.1.1-19 -- Remove xorg-x11-devel build requirement to see what breaks. -- Hack font paths (bug #173160). - -* Tue Nov 15 2005 Tim Waugh 4.1.1-18 -- Build requires xorg-x11-devel not XFree86-devel. - -* Tue Sep 6 2005 Tim Waugh 4.1.1-17 -- Make vncviewer prevent xscreensaver from blanking screen (bug #106552). - -* Thu Aug 11 2005 Tim Waugh 4.1.1-16 -- Added -nohttpd option to vncserver, based on patch from bug #161288. -- Included -nohttpd, -nolisten tcp, and -localhost options in example - sysconfig file (bug #165334). - -* Mon Aug 8 2005 Tim Waugh 4.1.1-15 -- Fixed xorg-x11 build (__SSP__ gets set by -fstack-protector). -- Fixed desktop file again (bug #63689). - -* Wed Jul 14 2005 Tim Waugh 4.1.1-14 -- Pulled RENDER support altogether. It can cause Xvnc to get into a busy - loop somehow. - -* Wed Jul 13 2005 Tim Waugh 4.1.1-13 -- RENDER clipping fix from Mark McLoughlin. - -* Mon Jun 27 2005 Tim Waugh 4.1.1-12 -- Fixed vncpasswd crash (bug #160471). - -* Wed Jun 22 2005 Tim Waugh -- Updated URL in vncservers file (bug #161334). - -* Tue Jun 21 2005 Tim Waugh 4.1.1-11 -- Don't ship vncconfig.py any more. -- Enable render by default for further testing. - -* Mon Jun 20 2005 Tim Waugh -- Build requires expat-devel (bug #160982). - -* Wed Apr 27 2005 Jeremy Katz - 4.1.1-10 -- silence %%post - -* Fri Apr 15 2005 Tim Waugh 4.1.1-9 -- Disable render by default. There are still screen artifacts from it. - -* Fri Apr 1 2005 Tim Waugh 4.1.1-8 -- Further render patch fix for Peter Åstrand. - -* Thu Mar 31 2005 Tim Waugh 4.1.1-7 -- Render patch fix from Peter Åstrand. Enabled render by default again. - -* Mon Mar 28 2005 Christopher Aillon 4.1.1-6 -- rebuilt - -* Fri Mar 25 2005 Christopher Aillon 4.1.1-5 -- Update the GTK+ theme icon cache on (un)install - -* Thu Mar 24 2005 Tim Waugh 4.1.1-4 -- Upgraded base package to xorg-x11-6.8.2-13. - -* Thu Mar 17 2005 Tim Waugh 4.1.1-3 -- Disable render by default (+render turns it back on). - -* Fri Mar 11 2005 Tim Waugh 4.1.1-2 -- 4.1.1 (with 4.1 Java viewer). -- No longer need module patch. - -* Thu Mar 10 2005 Tim Waugh 4.1-0.2 -- Improved render patch from Peter Åstrand. - -* Thu Mar 3 2005 Tim Waugh 4.1-0.1 -- 4.1 (but still 4.0 Java viewer for the moment). -- Removed sparc patch. -- Fixed VNC module link line (from upstream). - -* Wed Mar 2 2005 Tim Waugh 4.0-15 -- Upgraded base package to xorg-x11-6.8.2-6. -- Rebuild for new GCC. - -* Wed Feb 23 2005 Tim Waugh 4.0-14 -- Render support from Peter Åstrand. - -* Thu Feb 3 2005 Tim Waugh -- Don't restart the vncserver service on upgrade. - -* Tue Feb 1 2005 Tim Waugh 4.0-13 -- Upgraded base package to xorg-x11-6.8.1.903-2. - -* Fri Jan 7 2005 Tim Waugh -- Build requires patchutils (bug #144450). - -* Wed Jan 5 2005 Tim Waugh 4.0-12 -- Don't use initlog in the initscript. - -* Fri Dec 31 2004 Tim Waugh -- Cookie generation improvement from Jon Peatfield. - -* Mon Dec 13 2004 Tim Waugh 4.0-11 -- Create /tmp/.X11-unix if it doesn't already exist. - -* Wed Nov 24 2004 Tim Waugh 4.0-10 -- Use fastjar, not jar, so that the package rebuilds (bug #140671). - -* Wed Nov 17 2004 Tim Waugh 4.0-9 -- Don't build hw/xfree86/etc. -- Prevent xorg-x11 build failure in rman. -- Build requires autoconf, flex, bison. -- Use correct PATH setting when started from initscript (bug #84167). - -* Wed Oct 6 2004 Tim Waugh 4.0-8 -- Use runuser not su in initscript (bug #134594). - -* Wed Sep 29 2004 Tim Waugh 4.0-7 -- Upgraded base package to xorg-x11-6.8.1-4. - -* Tue Aug 31 2004 Tim Waugh 4.0-6 -- Upgraded base package to xorg-x11-6.7.99.903-1. - -* Fri Aug 27 2004 Tim Waugh 4.0-5 -- Built for Fedora Core 2. - -* Wed Aug 25 2004 Tim Waugh 4.0-4 -- Apply and enable Kristian Høgsberg's --use-fb patch. - -* Mon Aug 2 2004 Tim Waugh -- Fixed vnc-via patch (bug #128940). - -* Thu Jun 24 2004 Tim Waugh 4.0-3 -- 4.0. -- No longer need hotspot patch. -- Add sparc patch from bug #126382. - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Jun 1 2004 Tim Waugh 4.0-1.beta5.6 -- Turn ppc64 builds on again. - -* Tue Jun 1 2004 Tim Waugh 4.0-1.beta5.5 -- Exclude ppc64 until the build machine is fixed. -- Undo last vnc.def change to get vnc.so back. - -* Fri May 28 2004 Tim Waugh 4.0-1.beta5.4 -- Further vnc.def fix. -- Fix cursor handling for hotspots outside the bounding rectangle. - -* Thu May 27 2004 Tim Waugh 4.0-1.beta5.3 -- Fix ppc64 build. -- Fix debuginfo package. -- Another fix for REGION_INIT usage. - -* Wed May 26 2004 Tim Waugh 4.0-1.beta5.2 -- Switch to xorg-x11 (bug #119530). - -* Thu May 20 2004 Tim Waugh 4.0-1.beta5.1 -- 4.0beta5. -- Removed compat, f8 and crash patches. -- Fixed via patch now that NULL is not a valid parameter default. -- Updated gcc34 patch. - -* Wed Apr 14 2004 Tim Waugh 4.0-1.beta4.11 -- Allow parameters to be specified in the init script (bug #60176). - -* Wed Mar 31 2004 Tim Waugh 4.0-1.beta4.10 -- Back down to XFree86 again, since the Xvnc binary in 4.0-1.beta4.9 doesn't - work at all. - -* Tue Mar 23 2004 Tim Waugh 4.0-1.beta4.9 -- Build against xorg-x11. - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Sun Feb 1 2004 Tim Waugh -- Build fixes for GCC 3.4. - -* Fri Jan 23 2004 Tim Waugh 4.0-0.beta4.8 -- Fix last fix (bug #114063). - -* Thu Jan 22 2004 Tim Waugh 4.0-0.beta4.7 -- Restart connect() if a signal interrupts it (bug #114063). - -* Thu Nov 27 2003 Tim Waugh -- Fixed -via parsing bug in vncviewer (bug #110919). - -* Fri Nov 14 2003 Tim Waugh 4.0-0.beta4.6 -- F8 fix (bug #109377). - -* Mon Nov 10 2003 Tim Waugh 4.0-0.beta4.5 -- Better fix for bug #107455. - -* Sat Nov 8 2003 Tim Waugh 4.0-0.beta4.4 -- Fixed zero-sized cursor problem (bug #107455). - -* Thu Oct 2 2003 Tim Waugh -- Added icons (bug #105820). - -* Fri Sep 19 2003 Tim Waugh 4.0-0.beta4.3 -- Avoid a potential Xvnc crash (bug #104702). - -* Fri Sep 5 2003 Tim Waugh 4.0-0.beta4.2 -- 4.0beta4. -- No longer need compile, dotvnc, norender patches. -- Don't be so picky about which architectures to build on any more. -- Build requires XFree86-devel. - -* Thu Aug 28 2003 Tim Waugh 4.0-0.beta3.10 -- Fixed SSH tunnelling support (bug #102213). - -* Fri Aug 22 2003 Tim Waugh 4.0-0.beta3.9 -- Add SSH tunnelling support (bug #102213). - -* Wed Aug 20 2003 Tim Waugh 4.0-0.beta3.8 -- Disable IdleTimeout by default. - -* Mon Aug 18 2003 Tim Waugh 4.0-0.beta3.7 -- Ship vncconfig(1) front-end. -- In default xstartup, exec /etc/vnc/xstartup if it exists. -- Track XFree86 package. -- Fix compilation (bug #102547). -- Fix vncpasswd (bug #102435). - -* Tue Aug 12 2003 Tim Waugh 4.0-0.beta3.6 -- Use patched tarball from XFree86 package. -- Build Java VNC viewer. - -* Wed Aug 6 2003 Tim Waugh 4.0-0.beta3.5.1 -- Rebuilt. - -* Wed Aug 6 2003 Tim Waugh 4.0-0.beta3.5 -- Make default xclients file include instructions for 'normal' desktop. -- Server subpackage doesn't require XFree86. -- desktop file: add StartupWMClass tag -- init script: set USER (bug #101674). -- init script: pause when restarting to give the server a chance to stop - (bug #84817). -- vncpasswd: create ~/.vnc if it doesn't already exist. - -* Tue Aug 5 2003 Tim Waugh 4.0-0.beta3.4 -- Allow old -dontdisconnect option, and behave a bit more like Xvnc used to - if it is given (default to no password, use RFB3.3 protocol). -- Fixed DisconnectClients bug. - -* Mon Aug 4 2003 Tim Waugh 4.0-0.beta3.3 -- Disable RENDER altogether for Xvnc. - -* Mon Aug 4 2003 Tim Waugh 4.0-0.beta3.2 -- Reinstated init script. -- Add work-around for Xcursor bug. - -* Thu Jul 31 2003 Tim Waugh 4.0-0.beta3.1 -- Initial package. diff --git a/vncserver.init b/vncserver.init deleted file mode 100755 index 9135ebc..0000000 --- a/vncserver.init +++ /dev/null @@ -1,94 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 91 35 -# description: Starts and stops vncserver. \ -# used to provide remote X administration services. - -# Source function library. -. /etc/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - -unset VNCSERVERARGS -VNCSERVERS="" -[ -f /etc/sysconfig/vncservers ] && . /etc/sysconfig/vncservers - -prog=$"VNC server" - -start() { - echo -n $"Starting $prog: " - ulimit -S -c 0 >/dev/null 2>&1 - RETVAL=0 - if [ ! -d /tmp/.X11-unix ] - then - mkdir -m 1777 /tmp/.X11-unix || : - restorecon /tmp/.X11-unix 2>/dev/null || : - fi - NOSERV=1 - for display in ${VNCSERVERS} - do - NOSERV= - echo -n "${display} " - unset BASH_ENV ENV - DISP="${display%%:*}" - export USER="${display##*:}" - export VNCUSERARGS="${VNCSERVERARGS[${DISP}]}" - runuser -l ${USER} -c "cd ~${USER} && [ -f .vnc/passwd ] && vncserver :${DISP} ${VNCUSERARGS}" - RETVAL=$? - [ "$RETVAL" -ne 0 ] && break - done - if test -n "$NOSERV"; then echo -n "no displays configured "; fi - [ "$RETVAL" -eq 0 ] && success $"vncserver startup" || \ - failure $"vncserver start" - echo - [ "$RETVAL" -eq 0 ] && touch /var/lock/subsys/vncserver -} - -stop() { - echo -n $"Shutting down $prog: " - for display in ${VNCSERVERS} - do - echo -n "${display} " - unset BASH_ENV ENV - export USER="${display##*:}" - runuser ${USER} -c "vncserver -kill :${display%%:*}" >/dev/null 2>&1 - done - RETVAL=$? - [ "$RETVAL" -eq 0 ] && success $"vncserver shutdown" || \ - failure $"vncserver shutdown" - echo - [ "$RETVAL" -eq 0 ] && rm -f /var/lock/subsys/vncserver -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 3 - start - ;; - condrestart) - if [ -f /var/lock/subsys/vncserver ]; then - stop - sleep 3 - start - fi - ;; - status) - status Xvnc - ;; - *) - echo $"Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac -