summaryrefslogtreecommitdiff
path: root/net/tightvnc
diff options
context:
space:
mode:
authorlukem <lukem@pkgsrc.org>2002-10-20 14:33:53 +0000
committerlukem <lukem@pkgsrc.org>2002-10-20 14:33:53 +0000
commit067eeb231c0189df35147149e6ad4b5ded75ec7c (patch)
tree8aa6e38ee99ac3c210bff246100943611c579541 /net/tightvnc
parent50afdff32065017da42623b3022a1e51aa80ee21 (diff)
downloadpkgsrc-067eeb231c0189df35147149e6ad4b5ded75ec7c.tar.gz
Update to tightvnc 1.2.6. Notable changes:
all: - supply manual pages Xvnc: - fixed crash in the font server code - fixed blocking I/O problem which led to easy denial-of-service attacks via built-in HTTP server - fixed memory alignment problem in Raw encoder, for systems with strict alignment constraints - support libwrap for server access control - rely upon system zlib instead of shipping own copy - reset compression level & JPEG image quality on reading client's encoding list - allow applet parameters to be specified in URL request to the HTTP server vncpasswd: - work correctly if a filename is given vncserver: - default depth is 24 instead of 8 - attempt restart once if failed first time due to font path lossage - removed 2 second startup delay - allow users to keep vnc directories in /tmp - work correctly if $XAUTHORITY is not set
Diffstat (limited to 'net/tightvnc')
-rw-r--r--net/tightvnc/Makefile33
-rw-r--r--net/tightvnc/PLIST6
-rw-r--r--net/tightvnc/distinfo20
-rw-r--r--net/tightvnc/patches/patch-aa14
-rw-r--r--net/tightvnc/patches/patch-ad8
-rw-r--r--net/tightvnc/patches/patch-ae8
-rw-r--r--net/tightvnc/patches/patch-af14
-rw-r--r--net/tightvnc/patches/patch-ag27
-rw-r--r--net/tightvnc/patches/patch-ba21
-rw-r--r--net/tightvnc/patches/patch-bd27
-rw-r--r--net/tightvnc/patches/patch-be13
11 files changed, 125 insertions, 66 deletions
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index f8b806f24cd..b95b8bf0ec3 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2002/10/09 21:18:40 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/20 14:33:53 lukem Exp $
#
-DISTNAME= tightvnc-1.2.2
-PKGNAME= tightvnc-1.2.2
+DISTNAME= tightvnc-1.2.6
CATEGORIES= net x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vnc-tight/} \
ftp://ftp.uk.research.att.com/pub/vnc/dist/
-DISTFILES= tightvnc-1.2.2_unixsrc.tar.bz2 \
+DISTFILES= tightvnc-1.2.6_unixsrc.tar.bz2 \
vnc-3.3.2r2_doc.tgz
MAINTAINER= mycroft@netbsd.org
@@ -25,24 +24,32 @@ WRKSRC= ${WRKDIR}/vnc_unixsrc
ALL_TARGET= World
-post-extract:
- ${RM} -rf ${WRKSRC}/Xvnc/lib/zlib
-
# We have to frob a few things, and we want our own permissions, so it's easier
# to do the install ourselves.
post-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc ${PREFIX}/bin/Xvnc
- ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect ${PREFIX}/bin/vncconnect
- ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd ${PREFIX}/bin/vncpasswd
+ ${INSTALL_PROGRAM} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc \
+ ${PREFIX}/bin/Xvnc
+ ${INSTALL_MAN} ${WRKSRC}/Xvnc/programs/Xserver/Xvnc.man \
+ ${PREFIX}/man/man1/Xvnc.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncconnect/vncconnect \
+ ${PREFIX}/bin/vncconnect
+ ${INSTALL_MAN} ${WRKSRC}/vncconnect/vncconnect.man \
+ ${PREFIX}/man/man1/vncconnect.1
+ ${INSTALL_PROGRAM} ${WRKSRC}/vncpasswd/vncpasswd \
+ ${PREFIX}/bin/vncpasswd
+ ${INSTALL_MAN} ${WRKSRC}/vncpasswd/vncpasswd.man \
+ ${PREFIX}/man/man1/vncpasswd.1
${SED} -e 's|/usr/local/vnc/classes|${X11PREFIX}/share/vnc/classes|g' \
-e 's|/usr/bin/perl|${PERL5}|g' \
< ${WRKSRC}/vncserver \
> ${WRKSRC}/vncserver.local
${INSTALL_SCRIPT} ${WRKSRC}/vncserver.local ${PREFIX}/bin/vncserver
+ ${INSTALL_MAN} ${WRKSRC}/vncserver.man \
+ ${PREFIX}/man/man1/vncserver.1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/vnc
- cd ${WRKDIR}; \
- ${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \
- ${PREFIX}/share/doc/vnc
+ cd ${WRKDIR} && \
+ ${INSTALL_DATA} *.GIF *.css *.gif *.jpg *.htm *.html *.pdf \
+ ${PREFIX}/share/doc/vnc
.include "../../devel/zlib/buildlink2.mk"
.include "../../graphics/jpeg/buildlink2.mk"
diff --git a/net/tightvnc/PLIST b/net/tightvnc/PLIST
index a3e434d78a6..869d281ae19 100644
--- a/net/tightvnc/PLIST
+++ b/net/tightvnc/PLIST
@@ -1,8 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:59:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/10/20 14:33:53 lukem Exp $
bin/Xvnc
bin/vncconnect
bin/vncpasswd
bin/vncserver
+man/man1/Xvnc.1
+man/man1/vncconnect.1
+man/man1/vncpasswd.1
+man/man1/vncserver.1
share/doc/vnc/Xvnc.gif
share/doc/vnc/ach.jpg
share/doc/vnc/backbutton.gif
diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index d0a3f4b68ed..9f6e859b8a7 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,16 +1,18 @@
-$NetBSD: distinfo,v 1.5 2002/10/09 21:18:41 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/10/20 14:33:53 lukem Exp $
-SHA1 (tightvnc-1.2.2_unixsrc.tar.bz2) = c764122d17bb54a78accdf658029b5097caaa4f1
-Size (tightvnc-1.2.2_unixsrc.tar.bz2) = 1720393 bytes
+SHA1 (tightvnc-1.2.6_unixsrc.tar.bz2) = 3ff266a89d12cf49855fbeee3c7c6a8c6c2f07bd
+Size (tightvnc-1.2.6_unixsrc.tar.bz2) = 1717851 bytes
SHA1 (vnc-3.3.2r2_doc.tgz) = 857b05c4d8de8b00bfd1ab06a408d9d9a5bb4a6b
Size (vnc-3.3.2r2_doc.tgz) = 1009890 bytes
-SHA1 (patch-aa) = c642605b62bccc7fca23eda3d00654015bf3b8ab
+SHA1 (patch-aa) = 3445af5bc4b85f7a45049378f5806a5c993503f4
SHA1 (patch-ab) = f31282e99502dc50b53c660472aa297ef25e0772
SHA1 (patch-ac) = 71f7dcf81e731263b2bc0b9ea87326d1da2ff1a9
-SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
-SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
-SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
-SHA1 (patch-ag) = 0cb088fd8c5b2bad1e990a3e81e7b3a26c46f000
-SHA1 (patch-ba) = 8489c523ec15d575533e83336e42e843fcfd4b5c
+SHA1 (patch-ad) = fa346a71945facf9537a700267ebdfdb3f250453
+SHA1 (patch-ae) = e6c4d10dfdebb9e52636ec93bf78a6c91ae792fc
+SHA1 (patch-af) = 629c054da4003a6811838e90ba3e4ea2a697a51c
+SHA1 (patch-ag) = e8cb0ee74739d05c2f7b376db1026de3b85cc31a
+SHA1 (patch-ba) = 051a6f89ce03fcd6cdd5e6cd87671d171262c94f
SHA1 (patch-bb) = 5c16b81e57acfcc0dabce4ee3f429dd9be322d89
SHA1 (patch-bc) = a7f399320d3c06fa5c6ee940a8ede4c6422c7937
+SHA1 (patch-bd) = eea7eb3a690212c54667c68b72ecb1df9c667a68
+SHA1 (patch-be) = 3f26eaebfa2b6d62123676e4d3a4f43bff5592c0
diff --git a/net/tightvnc/patches/patch-aa b/net/tightvnc/patches/patch-aa
index 46795362ff8..4c90acd47c6 100644
--- a/net/tightvnc/patches/patch-aa
+++ b/net/tightvnc/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+$NetBSD: patch-aa,v 1.2 2002/10/20 14:33:54 lukem Exp $
---- Imakefile.orig Thu Oct 26 14:28:32 2000
+--- Imakefile.orig Fri Oct 18 10:51:23 2002
+++ Imakefile
@@ -1,7 +1,7 @@
#define IHaveSubdirs
@@ -11,13 +11,13 @@ $NetBSD: patch-aa,v 1.1 2001/09/23 01:34:30 mycroft Exp $
World:
make Makefiles
-@@ -9,8 +9,7 @@
+@@ -9,8 +9,7 @@ World:
make all
@echo ""
@echo Built $(SUBDIRS).
-- @echo 'To build Xvnc, do "cd Xvnc", followed by "make World"'
+- @echo 'To build Xvnc, do "cd Xvnc", followed by "./configure" then "make"'
- @echo ""
-+ (cd Xvnc && make World)
++ (cd Xvnc && ./configure && make)
- MakeSubdirs($(SUBDIRS))
- DependSubdirs($(SUBDIRS))
+ libs:
+ @echo 'No libraries included.'
diff --git a/net/tightvnc/patches/patch-ad b/net/tightvnc/patches/patch-ad
index a59322850e5..9154a9779ab 100644
--- a/net/tightvnc/patches/patch-ad
+++ b/net/tightvnc/patches/patch-ad
@@ -1,12 +1,12 @@
-$NetBSD: patch-ad,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+$NetBSD: patch-ad,v 1.2 2002/10/20 14:33:54 lukem Exp $
---- Xvnc/programs/Xserver/cfb/stipsparc.s.orig Wed Apr 27 08:14:23 1994
+--- Xvnc/programs/Xserver/cfb/stipsparc.s.orig Wed Mar 20 16:16:03 2002
+++ Xvnc/programs/Xserver/cfb/stipsparc.s
-@@ -85,7 +85,7 @@
+@@ -85,7 +85,7 @@ in this Software without prior written a
#define ForEachBits LY4
#define NextBits LY5
--#ifdef SVR4
+-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfbStippleStack cfbStippleStackTE
diff --git a/net/tightvnc/patches/patch-ae b/net/tightvnc/patches/patch-ae
index 9365a93709c..fece0d20e2f 100644
--- a/net/tightvnc/patches/patch-ae
+++ b/net/tightvnc/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+$NetBSD: patch-ae,v 1.2 2002/10/20 14:33:54 lukem Exp $
---- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig Wed Apr 27 08:14:23 1994
+--- Xvnc/programs/Xserver/cfb/stipsprc32.s.orig Wed Mar 20 16:16:03 2002
+++ Xvnc/programs/Xserver/cfb/stipsprc32.s
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ in this Software without prior written a
#define ForEachBits LY4
#define NextBits LY5
--#ifdef SVR4
+-#if defined(SVR4) || ( defined(linux) && defined(__ELF__) )
+#if defined(SVR4) || defined(__ELF__)
#ifdef TETEXT
#define _cfb32StippleStack cfb32StippleStackTE
diff --git a/net/tightvnc/patches/patch-af b/net/tightvnc/patches/patch-af
index 146965e92ac..2f6dab6f084 100644
--- a/net/tightvnc/patches/patch-af
+++ b/net/tightvnc/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+$NetBSD: patch-af,v 1.2 2002/10/20 14:33:54 lukem Exp $
---- Xvnc/programs/Xserver/include/servermd.h.orig Mon Jul 28 16:17:34 1997
+--- Xvnc/programs/Xserver/include/servermd.h.orig Wed Aug 7 21:42:53 2002
+++ Xvnc/programs/Xserver/include/servermd.h
-@@ -132,7 +132,7 @@
+@@ -132,7 +132,7 @@ SOFTWARE.
#endif /* vax */
@@ -11,10 +11,10 @@ $NetBSD: patch-af,v 1.1 2001/09/23 01:34:31 mycroft Exp $
/* For now this is for Xvfb only */
#define IMAGE_BYTE_ORDER MSBFirst
-@@ -336,7 +336,7 @@
-
- #endif /* luna */
-
+@@ -341,7 +341,7 @@ SOFTWARE.
+ #define BITMAP_BIT_ORDER MSBFirst
+ #endif /* (__s390__ || __s390x__) && linux */
+
-#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && defined(__i386__)) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
+#if (defined(i386) && (defined(SVR4) || defined(SYSV) || (defined(sun) && defined(SVR4))) || defined(__bsdi__) || (defined(__NetBSD__) && (defined(__i386__) || defined(__arm32__))) || (defined(__OpenBSD__) && defined(__i386__)) || defined(__FreeBSD__) || defined(MACH386) || (defined(linux) && !defined(__mc68000__)) || (defined(AMOEBA) && defined(i80386)) || defined(MINIX) || defined(__EMX__) || (defined(Lynx) && defined(__i386__)))
diff --git a/net/tightvnc/patches/patch-ag b/net/tightvnc/patches/patch-ag
index 0d89123b612..243d411765d 100644
--- a/net/tightvnc/patches/patch-ag
+++ b/net/tightvnc/patches/patch-ag
@@ -1,15 +1,18 @@
-$NetBSD: patch-ag,v 1.1 2001/09/23 01:34:31 mycroft Exp $
+$NetBSD: patch-ag,v 1.2 2002/10/20 14:33:54 lukem Exp $
---- vncserver.orig Thu Oct 26 16:16:37 2000
+--- vncserver.orig Tue Aug 27 22:19:38 2002
+++ vncserver
-@@ -149,8 +149,8 @@
- # Add font path and color database stuff here, e.g.:
- #
- # $cmd .= " -fp unix/:7100";
--# $cmd .= " -fp /usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
--# $cmd .= " -co /usr/lib/X11/rgb";
-+$cmd .= " -fp /usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
-+$cmd .= " -co /usr/X11R6/lib/X11/rgb";
- #
+@@ -41,10 +41,11 @@ $vncUserDir = "$ENV{HOME}/.vnc";
+ $fontPath = "unix/:7100";
- foreach $arg (@ARGV) {
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++# $fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/75dpi/";
+
+ # X colors database path is optional, uncomment and edit to use:
+-# $colorPath = "/usr/lib/X11/rgb";
++# $colorPath = "/usr/X11R6/lib/X11/rgb";
+
+ # You might wish to make your vnc directory under /tmp, to make sure
+ # passwords are always kept on the local filesystem. To do that, just
diff --git a/net/tightvnc/patches/patch-ba b/net/tightvnc/patches/patch-ba
index 5f3b1ef8518..4969ce89e03 100644
--- a/net/tightvnc/patches/patch-ba
+++ b/net/tightvnc/patches/patch-ba
@@ -1,11 +1,14 @@
-$NetBSD: patch-ba,v 1.2 2002/10/09 21:18:41 jlam Exp $
+$NetBSD: patch-ba,v 1.3 2002/10/20 14:33:54 lukem Exp $
---- Xvnc/config/cf/vnclibs.def.orig Mon Jan 29 21:24:14 2001
-+++ Xvnc/config/cf/vnclibs.def Sun Sep 23 01:08:42 2001
-@@ -5,5 +5,5 @@
- * and programs/Xserver/hw/vnc whenever you change this file.
- */
+--- Xvnc/config/cf/vnclibs.def.orig Fri Jun 28 15:53:19 2002
++++ Xvnc/config/cf/vnclibs.def
+@@ -11,7 +11,7 @@ VNCLIBS = $(TOP)/../libvncauth/libvncaut
+ /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */
+ VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a
+ #else
+-VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz
++VNCSYSLIBS = ${BUILDLINK_LDFLAGS} -ljpeg -lz
+ #endif
--VNCLIBS = $(TOP)/../libvncauth/libvncauth.a /usr/lib/libjpeg.a
-+VNCLIBS = $(TOP)/../libvncauth/libvncauth.a ${BUILDLINK_LDFLAGS} -ljpeg
- VNCCPPFLAGS = -I$(TOP)/../include
+-VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include
++VNCCPPFLAGS = -I$(TOP)/../include ${BUILDLINK_CPPFLAGS}
diff --git a/net/tightvnc/patches/patch-bd b/net/tightvnc/patches/patch-bd
new file mode 100644
index 00000000000..3be64bbd32e
--- /dev/null
+++ b/net/tightvnc/patches/patch-bd
@@ -0,0 +1,27 @@
+$NetBSD: patch-bd,v 1.1 2002/10/20 14:33:54 lukem Exp $
+
+--- Xvnc/config/cf/vnc.def.orig Tue Aug 27 22:19:38 2002
++++ Xvnc/config/cf/vnc.def
+@@ -10,8 +10,6 @@
+
+ #ifdef BeforeVendorCF
+
+-#include "platform.def"
+-
+ /*****************************************************************************/
+ /*
+ * First try to switch off all the extras that we don't want. This includes
+@@ -117,13 +115,7 @@
+ * You may need to change this.
+ */
+
+-#ifdef SunArchitecture
+-#define ProjectRoot /usr/openwin
+-#else
+-#ifdef LinuxArchitecture
+ #define ProjectRoot /usr/X11R6
+-#endif
+-#endif
+
+ #endif /* BeforeVendorCF */
+
diff --git a/net/tightvnc/patches/patch-be b/net/tightvnc/patches/patch-be
new file mode 100644
index 00000000000..c494de2910b
--- /dev/null
+++ b/net/tightvnc/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2002/10/20 14:33:54 lukem Exp $
+
+--- Xvnc/configure.orig Tue Apr 30 23:07:30 2002
++++ Xvnc/configure
+@@ -24,7 +24,7 @@ else
+ MINOR=`echo $REV | awk -F. 'NF < 2 {print "0"} {print $2}'`
+ TEENY=0
+ else
+- REV=`uname -r | sed -e 's/^V//' -e 's/-.*$//'`
++ REV=`uname -r | sed -e 's/^V//' -e 's/[-_].*$//'`
+ MAJOR=`echo $REV | awk -F. 'NF < 1 {print "0"} {print $1}'`
+ MINOR=`echo $REV | awk -F. 'NF < 2 {print "0"} {print $2}'`
+ TEENY=`echo $REV | awk -F. 'NF < 3 {print "0"} {print $3}'`