drop tightvnc and allow ssvnc-viewer to replace tightvnc-viewer.

- tightvnc-server is based on a really old X release - it barely
works on i386, but doesn't support most X clients - and fails on most
other arch (it's neither LP64 nor big-endian clean).

x11vnc is a suitable alternative for some users, anyone interested
in the exact same type of functionality (standalone RFB X server)
should look at porting tigervnc.

- ssvnc-viewer is a significantly improved fork of tightvnc-viewer
and basically a drop-in replacement (same filename for the viewer).

ok dcoppa@ and supported by weerd@ and various ports@ readers
This commit is contained in:
sthen 2011-07-02 10:41:59 +00:00
parent df722c15fb
commit 4e5eb0f34d
19 changed files with 5 additions and 454 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.47 2011/06/13 16:35:02 edd Exp $
# $OpenBSD: Makefile,v 1.48 2011/07/02 10:41:59 sthen Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-1.45
PKGNAME = quirks-1.46
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.53 2011/06/13 16:35:02 edd Exp $
# $OpenBSD: Quirks.pm,v 1.54 2011/07/02 10:41:59 sthen Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -203,6 +203,7 @@ my $stem_extensions = {
'tomboy' => 'gnote',
'dovecot-sieve' => 'dovecot-pigeonhole',
'wormux' => 'warmux',
'tightvnc-viewer' => 'ssvnc-viewer',
};
# ->is_base_system($handle, $state):

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.702 2011/06/29 10:41:15 jasper Exp $
# $OpenBSD: Makefile,v 1.703 2011/07/02 10:41:59 sthen Exp $
# $FreeBSD: Makefile,v 1.129 1997/11/20 13:47:40 itojun Exp $
#
@ -527,7 +527,6 @@
SUBDIR += tcptraceroute
SUBDIR += telepathy
SUBDIR += thcrut
SUBDIR += tightvnc
SUBDIR += tintin++
SUBDIR += tinyfugue
SUBDIR += tircd

View File

@ -1,68 +0,0 @@
# $OpenBSD: Makefile,v 1.31 2010/11/19 22:31:39 espie Exp $
COMMENT-main= cross-platform remote desktop access
COMMENT-viewer= client for cross-platform remote desktop access
VERSION= 1.3.10
PKGNAME-main= tightvnc-${VERSION}
PKGNAME-viewer= tightvnc-viewer-${VERSION}
REVISION-main= 0
REVISION-viewer=1
DISTNAME= tightvnc-${VERSION}_unixsrc
CATEGORIES= net
HOMEPAGE= http://www.tightvnc.org/
MAINTAINER= Rob Casey <rob@minauros.com>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/}
WRKDIST= ${WRKDIR}/vnc_unixsrc
MULTI_PACKAGES= -main -viewer
CONFIGURE_STYLE=imake
ALL_TARGET= World
USE_GROFF = Yes
NO_REGRESS= Yes
WANTLIB= X11 Xau Xdmcp Xext c z
WANTLIB-viewer= ${WANTLIB} ICE SM Xaw Xmu Xpm Xt jpeg>=62
LIB_DEPENDS-viewer= graphics/jpeg
WANTLIB-main= ${WANTLIB} m
MAKE_FLAGS= CC=${CC} \
CCOPTIONS="${CFLAGS}"
DOCUMENTATION= vncserver.man vncpasswd/vncpasswd.man vncconnect/vncconnect.man \
Xvnc/programs/Xserver/Xvnc.man vncviewer/vncviewer.man
post-install:
${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
${INSTALL_PROGRAM} ${WRKSRC}/vncviewer/vncviewer ${PREFIX}/bin/vncviewer
${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
sed -e s%/usr/local/vnc/classes%${TRUEPREFIX}/share/vnc/classes% \
< ${WRKSRC}/vncserver \
> ${WRKSRC}/vncserver.local
${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
${INSTALL_DATA_DIR} ${PREFIX}/share/vnc
${INSTALL_DATA_DIR} ${PREFIX}/share/vnc/classes
${INSTALL_DATA} ${WRKSRC}/classes/* ${PREFIX}/share/vnc/classes
.for i in ${DOCUMENTATION}
${INSTALL_MAN} ${WRKSRC}/$i ${PREFIX}/man/man1/${i:T:R}.1
.endfor
.include <bsd.port.mk>

View File

@ -1,5 +0,0 @@
MD5 (tightvnc-1.3.10_unixsrc.tar.gz) = lTcSewKkWJRD8tCXG9ixrw==
RMD160 (tightvnc-1.3.10_unixsrc.tar.gz) = RA4U/ErFQ19yCQlnEx+j3zetbLo=
SHA1 (tightvnc-1.3.10_unixsrc.tar.gz) = k4rWv6dZSKMV45njWFMpSEPcR5M=
SHA256 (tightvnc-1.3.10_unixsrc.tar.gz) = vyW72G5eVd35fTziwU0QPnHr47BlRb2wcDmX5VEIiz0=
SIZE (tightvnc-1.3.10_unixsrc.tar.gz) = 2250547

View File

@ -1,10 +0,0 @@
--- Imakefile.orig 2002-04-30 15:07:08.000000000 +0200
+++ Imakefile 2003-11-18 22:38:50.000000000 +0100
@@ -11,6 +11,7 @@ World:
@echo Built $(SUBDIRS).
@echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
@echo ""
+ (cd Xvnc; ./configure; make)
libs:
@echo 'No libraries included.'

View File

@ -1,47 +0,0 @@
$OpenBSD: patch-Xvnc_config_cf_OpenBSD_cf,v 1.4 2009/01/19 08:01:34 pea Exp $
--- Xvnc/config/cf/OpenBSD.cf.orig Sun Jun 11 14:00:51 2000
+++ Xvnc/config/cf/OpenBSD.cf Fri Dec 5 12:37:36 2008
@@ -67,7 +67,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
#if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit)
#define DefaultCCOptions /**/
#else
-#define DefaultCCOptions -ansi -Dasm=__asm
+#define DefaultCCOptions -Dasm=__asm
#endif
#define GccGasOption -DGCCUSESGAS
@@ -105,6 +105,25 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
# endif
#endif
+#if defined(SparcArchitecture)
+# define ServerOSDefines -DDDXOSINIT
+# if defined(Sparc64Architecture)
+# define ServerExtraDefines GccGasOption -D_XSERVER64
+# else
+# define ServerExtraDefines GccGasOption
+# endif
+# define PexDynamicModule NO
+# define XieDynamicModule NO
+#endif
+
+#if defined(macppcArchitecture)
+# define ServerOSDefines -DDDXOSINIT
+# define ServerExtraDefines GccGasOption -D__macppc__
+# define PexDynamicModule NO
+# define XieDynamicModule NO
+# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT
+#endif
+
#define StandardDefines -DCSRG_BASED
#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
@@ -227,7 +246,7 @@ install.man:: @@\
# define XF86Contrib
# include <xf86.rules>
-# define BuildServer NO
+# define BuildServer YES
# define XnestServer NO
# define XVirtualFramebufferServer NO

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Xvnc_config_cf_vnc_def,v 1.2 2003/11/18 22:02:09 sturm Exp $
--- Xvnc/config/cf/vnc.def.orig 2002-11-13 19:03:27.000000000 +0100
+++ Xvnc/config/cf/vnc.def 2003-11-18 22:38:50.000000000 +0100
@@ -120,7 +120,7 @@
#ifdef SunArchitecture
#define ProjectRoot /usr/openwin
#else
-#ifdef LinuxArchitecture
+#if defined(LinuxArchitecture) || defined(OpenBSDArchitecture)
#define ProjectRoot /usr/X11R6
#endif
#endif

View File

@ -1,18 +0,0 @@
--- Xvnc/config/cf/vnclibs.def.orig Fri Dec 5 12:38:31 2008
+++ Xvnc/config/cf/vnclibs.def Fri Dec 5 12:39:17 2008
@@ -5,13 +5,5 @@
* and programs/Xserver/hw/vnc whenever you change this file.
*/
-VNCLIBS = $(TOP)/../libvncauth/libvncauth.a
-
-#ifdef OSF1Architecture
-/* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
-VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt
-#else
-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt
-#endif
-
-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a ${LOCALBASE}/lib/libjpeg.a
+VNCCPPFLAGS = -I$(TOP)/../include -I${LOCALBASE}/include

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Xvnc_programs_Xserver_Imakefile,v 1.1 2009/10/26 17:33:58 sthen Exp $
--- Xvnc/programs/Xserver/Imakefile.orig Mon Oct 26 07:06:46 2009
+++ Xvnc/programs/Xserver/Imakefile Mon Oct 26 07:07:13 2009
@@ -140,7 +140,7 @@ XPFBLIBS = dix/LibraryTargetName(xpstubs)
#if BuildLBX || GzipFontCompression
ZLIB = GzipLibrary
#endif
- OS = os/LibraryTargetName(os) $(XAULIB) $(XDMCPLIB)
+ OS = os/LibraryTargetName(os) dix/libdix.a $(XAULIB) $(XDMCPLIB)
BSDEMUL = $(DEPXBSDLIB)
MFB = mfb/LibraryTargetName(mfb)
CFB = cfb/LibraryTargetName(cfb) cfb16/LibraryTargetName(cfb) cfb24/LibraryTargetName(cfb) cfb32/LibraryTargetName(cfb)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Xvnc_programs_Xserver_cfb_stipsparc_s,v 1.2 2009/01/19 08:01:34 pea Exp $
--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig Wed Mar 20 06:16:03 2002
+++ Xvnc/programs/Xserver/cfb/stipsparc.s Fri Dec 5 12:37:36 2008
@@ -85,7 +85,7 @@ in this Software without prior written authorization f
#define ForEachBits LY4
#define NextBits LY5
-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfbStippleStack cfbStippleStackTE
#else

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Xvnc_programs_Xserver_cfb_stipsprc32_s,v 1.2 2009/01/19 08:01:34 pea Exp $
--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig Wed Mar 20 06:16:03 2002
+++ Xvnc/programs/Xserver/cfb/stipsprc32.s Fri Dec 5 12:37:36 2008
@@ -81,7 +81,7 @@ in this Software without prior written authorization f
#define ForEachBits LY4
#define NextBits LY5
-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfb32StippleStack cfb32StippleStackTE
#else

View File

@ -1,107 +0,0 @@
$OpenBSD: patch-Xvnc_programs_Xserver_include_servermd_h,v 1.4 2005/10/13 01:37:26 pvalchev Exp $
--- Xvnc/programs/Xserver/include/servermd.h.orig Wed Feb 19 09:39:54 2003
+++ Xvnc/programs/Xserver/include/servermd.h Wed Oct 12 16:24:00 2005
@@ -132,7 +132,7 @@ SOFTWARE.
#endif /* vax */
-#if (defined(Lynx) && defined(__powerpc__))
+#ifdef __powerpc__
/* For now this is for Xvfb only */
#define IMAGE_BYTE_ORDER MSBFirst
@@ -147,10 +147,43 @@ SOFTWARE.
#define FAST_MEMCPY
-#endif /* LynxOS PowerPC */
+#endif /* PowerPC */
+#if defined(__arm32__) || defined(__arm__)
+
+#define IMAGE_BYTE_ORDER LSBFirst
+#define BITMAP_BIT_ORDER LSBFirst
+
+#define GLYPHPADBYTES 4
+#define GETLEFTBITS_ALIGNMENT 1
+#define LARGE_INSTRUCTION_CACHE
+#define AVOID_MEMORY_READ
+
+#endif /* __arm32__ || __arm__ */
+
+#if defined(__sh__)
+
+#if defined(__BIG_ENDIAN__)
+# define IMAGE_BYTE_ORDER MSBFirst
+# define BITMAP_BIT_ORDER MSBFirst
+# define GLYPHPADBYTES 4
+# define GETLEFTBITS_ALIGNMENT 1
+#else
+# define IMAGE_BYTE_ORDER LSBFirst
+# define BITMAP_BIT_ORDER LSBFirst
+# define GLYPHPADBYTES 4
+# define GETLEFTBITS_ALIGNMENT 1
+#endif
+
+#define AVOID_MEMORY_READ
+#define FAST_CONSTANT_OFFSET_MODE
+#define LARGE_INSTRUCTION_CACHE
+#define PLENTIFUL_REGISTERS
+
+#endif /* SuperH */
+
+
#if (defined(sun) && !(defined(i386) && defined(SVR4))) || \
- (defined(AMOEBA) && (defined(sparc) || defined(mc68000))) || \
(defined(__uxp__) && (defined(sparc) || defined(mc68000))) || \
(defined(Lynx) && defined(__sparc__)) || \
((defined(__NetBSD__) || defined(__OpenBSD__)) && \
@@ -214,20 +247,6 @@ SOFTWARE.
#endif /* ibm */
-#ifdef hpux
-
-#define IMAGE_BYTE_ORDER MSBFirst /* Values for the HP only */
-#define BITMAP_BIT_ORDER MSBFirst
-#define GLYPHPADBYTES 2 /* to match product server */
-#define GETLEFTBITS_ALIGNMENT 4 /* PA forces longs to 4 */
- /* byte boundries */
-#define AVOID_MEMORY_READ
-#define FAST_CONSTANT_OFFSET_MODE
-#define LARGE_INSTRUCTION_CACHE
-#define PLENTIFUL_REGISTERS
-
-#endif /* hpux */
-
#if defined (M4310) || defined(M4315) || defined(M4317) || defined(M4319) || defined(M4330)
#define IMAGE_BYTE_ORDER MSBFirst /* Values for Pegasus only */
@@ -305,6 +324,27 @@ SOFTWARE.
#define LOG2_BYTES_PER_SCANLINE_PAD_PROTO 2
#endif /* alpha */
+
+#if defined(__AMD64__) || defined(AMD64) || defined(__amd64__)
+# define IMAGE_BYTE_ORDER LSBFirst
+
+# if defined(XF86MONOVGA) || defined(XF86VGA16) || defined(XF86MONO)
+# define BITMAP_BIT_ORDER MSBFirst
+# else
+# define BITMAP_BIT_ORDER LSBFirst
+# endif
+
+# if defined(XF86MONOVGA) || defined(XF86VGA16)
+# define BITMAP_SCANLINE_UNIT 8
+# endif
+
+# define GLYPHPADBYTES 4
+# define GETLEFTBITS_ALIGNMENT 1
+# define LARGE_INSTRUCTION_CACHE
+# define FAST_CONSTANT_OFFSET_MODE
+/* ???? */
+# define FAST_UNALIGNED_READS
+#endif /* AMD64 */
#ifdef stellar

View File

@ -1,71 +0,0 @@
$OpenBSD: patch-vncserver,v 1.5 2009/10/26 17:33:58 sthen Exp $
--- vncserver.orig Thu Feb 12 15:27:18 2009
+++ vncserver Mon Oct 26 06:53:56 2009
@@ -66,13 +66,23 @@ unless ($xauthorityFile) {
}
}
+$defaultFontPath
+ = (
+ "/usr/X11R6/lib/X11/fonts/Type1/,".
+ "/usr/X11R6/lib/X11/fonts/Speedo/,".
+ "/usr/X11R6/lib/X11/fonts/cyrillic/,".
+ "/usr/X11R6/lib/X11/fonts/misc/,".
+ "/usr/X11R6/lib/X11/fonts/75dpi/,".
+ "/usr/X11R6/lib/X11/fonts/100dpi/"
+ );
+
chop($host = `uname -n`);
# Check command line options
&ParseOptions("-geometry",1,"-depth",1,"-pixelformat",1,"-name",1,"-kill",1,
- "-help",0,"-h",0,"--help",0);
+ "-help",0,"-h",0,"--help",0,"-fp",1);
&Usage() if ($opt{'-help'} || $opt{'-h'} || $opt{'--help'});
@@ -95,6 +105,25 @@ if ($opt{'-pixelformat'}) {
&CheckGeometryAndDepth();
+# bmah: Construct font path. Starting from a list of possible font directories
+# bmah: make up the set of those that have fonts.dir files we can read.
+# bmah: Probably there are way better methods of doing this.
+
+if (!$opt{'-fp'}) {
+ $opt{'-fp'} = $defaultFontPath;
+}
+
+@fontPathElements = split(/,/, "$opt{'-fp'}");
+
+$fontPath = '';
+
+foreach $i (0.."$#fontPathElements") {
+ if (-r "$fontPathElements[$i]/fonts.dir") {
+ $fontPath .= "$fontPathElements[$i],";
+ }
+}
+chop $fontPath;
+
if ($opt{'-name'}) {
$desktopName = $opt{'-name'};
}
@@ -226,6 +255,7 @@ if (-e "/tmp/.X11-unix/X$displayNumber") {
$ENV{DISPLAY}= "$host:$displayNumber";
}
$ENV{VNCDESKTOP}= $desktopName;
+$ENV{XAUTHORITY}= $xauthorityFile;
system("$xstartup >> " . &quotedString($desktopLog) . " 2>&1 &");
@@ -237,6 +267,8 @@ exit;
# CheckGeometryAndDepth simply makes sure that the geometry and depth values
# are sensible.
#
+# bmah: Bring in the fontpath we computed earlier.
+$cmd .= " -fp $fontPath";
sub CheckGeometryAndDepth
{

View File

@ -1,23 +0,0 @@
--- vncviewer/Imakefile.orig Wed Mar 12 17:20:34 2003
+++ vncviewer/Imakefile Fri Dec 5 12:37:37 2008
@@ -10,17 +10,10 @@ XCOMM seems to cause problems on Digital Unix.
DEFINES = -DMITSHM
#endif
-ZLIB_INC = -I/usr/local/include
-JPEG_INC = -I/usr/local/include
-INCLUDES = -I../include -I. $(ZLIB_INC) $(JPEG_INC) -I/usr/include
+INCLUDES = -I../include -I. -I/usr/include -I${LOCALBASE}/include
VNCAUTH_LIB = ../libvncauth/libvncauth.a
-ZLIB_LIB = -L/usr/local/lib -lz
-#ifdef OSF1Architecture
-XCOMM Avoid linking with different libjpeg in /usr/shlib under Tru64.
-JPEG_LIB = /usr/local/lib/libjpeg.a
-#else
-JPEG_LIB = -L/usr/local/lib -ljpeg
-#endif
+ZLIB_LIB = -lz
+JPEG_LIB = -ljpeg
DEPLIBS = XawClientDepLibs $(VNCAUTH_LIB)
LOCAL_LIBRARIES = XawClientLibs $(VNCAUTH_LIB) $(ZLIB_LIB) $(JPEG_LIB)

View File

@ -1,7 +0,0 @@
TightVNC is an enhanced version of VNC, which is optimized to work over
slow network connections such as low-speed modem links. While original
VNC may be very slow when your connection is not fast enough, with
TightVNC you can work remotely almost in real time in most environments.
Besides bandwidth optimizations, TightVNC also includes many other
improvements, optimizations and bugfixes over VNC. Note that TightVNC is
free, cross-platform and compatible with the standard VNC.

View File

@ -1,9 +0,0 @@
TightVNC is an enhanced version of VNC, which is optimized to work over
slow network connections such as low-speed modem links. While original
VNC may be very slow when your connection is not fast enough, with
TightVNC you can work remotely almost in real time in most environments.
Besides bandwidth optimizations, TightVNC also includes many other
improvements, optimizations and bugfixes over VNC. Note that TightVNC is
free, cross-platform and compatible with the standard VNC.
This package only includes the viewer.

View File

@ -1,32 +0,0 @@
@comment $OpenBSD: PLIST-main,v 1.2 2009/01/19 08:01:34 pea Exp $
@pkgpath net/tightvnc
@bin bin/Xvnc
@bin bin/vncconnect
@bin bin/vncpasswd
bin/vncserver
@man man/man1/Xvnc.1
@man man/man1/vncconnect.1
@man man/man1/vncpasswd.1
@man man/man1/vncserver.1
share/vnc/
share/vnc/classes/
share/vnc/classes/AuthPanel.class
share/vnc/classes/ButtonPanel.class
share/vnc/classes/CapabilityInfo.class
share/vnc/classes/CapsContainer.class
share/vnc/classes/ClipboardFrame.class
share/vnc/classes/DesCipher.class
share/vnc/classes/InStream.class
share/vnc/classes/MemInStream.class
share/vnc/classes/OptionsFrame.class
share/vnc/classes/RecordingFrame.class
share/vnc/classes/ReloginPanel.class
share/vnc/classes/RfbProto.class
share/vnc/classes/SessionRecorder.class
share/vnc/classes/SocketFactory.class
share/vnc/classes/VncCanvas.class
share/vnc/classes/VncCanvas2.class
share/vnc/classes/VncViewer.class
share/vnc/classes/VncViewer.jar
share/vnc/classes/ZlibInStream.class
share/vnc/classes/index.vnc

View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST-viewer,v 1.10 2010/10/23 21:55:56 naddy Exp $
@bin bin/vncviewer
@comment @man man/cat1/vncviewer.0
@man man/man1/vncviewer.1