create branch for 2.2

5 files changed, 137 insertions, 0 deletions

diff --git a/tightvnc/.footprint b/tightvnc/.footprint
new file mode 100644
index 000000000..f28a4c0cc
--- /dev/null
+++ b/tightvnc/.footprint
@@ -0,0 +1,30 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/Xvnc
+-rwxr-xr-x	root/root	usr/bin/vncconnect
+-rwxr-xr-x	root/root	usr/bin/vncpasswd
+-rwxr-xr-x	root/root	usr/bin/vncserver
+-rwxr-xr-x	root/root	usr/bin/vncviewer
+drwxr-xr-x	root/root	usr/man/
+drwxr-xr-x	root/root	usr/man/man1/
+-rw-r--r--	root/root	usr/man/man1/Xvnc.1.gz
+-rw-r--r--	root/root	usr/man/man1/vncserver.1.gz
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/vnc/
+drwxr-xr-x	root/root	usr/share/vnc/classes/
+-rw-r--r--	root/root	usr/share/vnc/classes/AuthPanel.class
+-rw-r--r--	root/root	usr/share/vnc/classes/ButtonPanel.class
+-rw-r--r--	root/root	usr/share/vnc/classes/ClipboardFrame.class
+-rw-r--r--	root/root	usr/share/vnc/classes/DesCipher.class
+-rw-r--r--	root/root	usr/share/vnc/classes/HTTPConnectSocket.class
+-rw-r--r--	root/root	usr/share/vnc/classes/HTTPConnectSocketFactory.class
+-rw-r--r--	root/root	usr/share/vnc/classes/OptionsFrame.class
+-rw-r--r--	root/root	usr/share/vnc/classes/RecordingFrame.class
+-rw-r--r--	root/root	usr/share/vnc/classes/ReloginPanel.class
+-rw-r--r--	root/root	usr/share/vnc/classes/RfbProto.class
+-rw-r--r--	root/root	usr/share/vnc/classes/SessionRecorder.class
+-rw-r--r--	root/root	usr/share/vnc/classes/SocketFactory.class
+-rw-r--r--	root/root	usr/share/vnc/classes/VncCanvas.class
+-rw-r--r--	root/root	usr/share/vnc/classes/VncViewer.class
+-rw-r--r--	root/root	usr/share/vnc/classes/VncViewer.jar
+-rw-r--r--	root/root	usr/share/vnc/classes/index.vnc
diff --git a/tightvnc/.md5sum b/tightvnc/.md5sum
new file mode 100644
index 000000000..2cd031b99
--- /dev/null
+++ b/tightvnc/.md5sum
@@ -0,0 +1,3 @@
+f804b26c098625e3a2675a0aa7709e31  tightvnc-1.2.9_unixsrc.tar.bz2
+a56ee2536e932f1d41c0463da6873029  tightvnc-config.patch
+e96009678734768ab89419ca83ebdfee  tightvnc-gcc3.4.patch
diff --git a/tightvnc/Pkgfile b/tightvnc/Pkgfile
new file mode 100644
index 000000000..ccc60f151
--- /dev/null
+++ b/tightvnc/Pkgfile
@@ -0,0 +1,30 @@
+# Description: an enhanced version of the VNC client/server networked graphical desktop protocol and applications
+# URL: http://www.tightvnc.org
+# Maintainer: sten, nick dot steeves at shaw dot ca
+# Packager: Thanks for the patch Jaeger
+# Depends on: x11
+
+# Might conflict with the vncviewer
+
+name=tightvnc
+version=1.2.9
+release=4
+source=(http://download.sourceforge.net/sourceforge/vnc-tight/tightvnc-${version}_unixsrc.tar.bz2  $name-config.patch $name-gcc3.4.patch )
+
+build() {
+	cd vnc_unixsrc;
+	patch -p1 < $SRC/$name-gcc3.4.patch
+	patch < $SRC/$name-config.patch
+	xmkmf
+	make World
+	cd Xvnc
+	./configure
+	make
+	cd ..
+	mkdir -p $PKG/usr/man/man1 $PKG/usr/bin $PKG/usr/share/vnc/classes
+	cp Xvnc/programs/Xserver/Xvnc vncviewer/vncviewer vncpasswd/vncpasswd vncconnect/vncconnect $PKG/usr/bin
+	cp vncserver $PKG/usr/bin
+	cp classes/* $PKG/usr/share/vnc/classes
+	cp Xvnc/programs/Xserver/Xvnc.man $PKG/usr/man/man1/Xvnc.1
+	cp vncserver.man $PKG/usr/man/man1/vncserver.1
+}
diff --git a/tightvnc/tightvnc-config.patch b/tightvnc/tightvnc-config.patch
new file mode 100644
index 000000000..7d1dad66b
--- /dev/null
+++ b/tightvnc/tightvnc-config.patch
@@ -0,0 +1,18 @@
+--- vncserver~	2003-07-31 08:19:37.000000000 -0600
++++ vncserver	2005-07-17 14:34:38.000000000 -0600
+@@ -36,12 +36,12 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/vnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "/usr/X11R6/lib/X11/fonts/misc,/usr/X11R6/lib/X11/fonts/Type1,/usr/X11R6/lib/X11/fonts/75dpi";
+ 
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++# $fontPath = "$fontPath = "unix/:7100";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+ # $colorPath = "/usr/lib/X11/rgb";
diff --git a/tightvnc/tightvnc-gcc3.4.patch b/tightvnc/tightvnc-gcc3.4.patch
new file mode 100644
index 000000000..5ba1c1b4c
--- /dev/null
+++ b/tightvnc/tightvnc-gcc3.4.patch
@@ -0,0 +1,56 @@
+diff -urN vnc_unixsrc.orig/Xvnc/include/Xpoll.h vnc_unixsrc/Xvnc/include/Xpoll.h
+--- vnc_unixsrc.orig/Xvnc/include/Xpoll.h	2002-04-30 08:07:30.000000000 -0500
++++ vnc_unixsrc/Xvnc/include/Xpoll.h	2005-05-05 08:16:42.269634912 -0500
+@@ -65,6 +65,8 @@
+ #define NBBY	8		/* number of bits in a byte */
+ #endif
+ 
++#define fds_bits __fds_bits
++
+ #ifndef NFDBITS
+ #define NFDBITS (sizeof(fd_mask) * NBBY)	/* bits per mask */
+ #endif
+diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c vnc_unixsrc/Xvnc/lib/Xau/AuRead.c
+--- vnc_unixsrc.orig/Xvnc/lib/Xau/AuRead.c	2000-06-11 07:00:52.000000000 -0500
++++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c	2005-05-05 08:15:18.355391816 -0500
+@@ -49,7 +49,7 @@
+ FILE	*file;
+ {
+     unsigned short  len;
+-    char	    *data, *malloc ();
++    char	    *data;
+ 
+     if (read_short (&len, file) == 0)
+ 	return 0;
+@@ -76,7 +76,6 @@
+ {
+     Xauth   local;
+     Xauth   *ret;
+-    char    *malloc ();
+ 
+     if (read_short (&local.family, auth_file) == 0)
+ 	return 0;
+diff -urN vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c
+--- vnc_unixsrc.orig/Xvnc/lib/Xau/AuWrite.c	2000-06-11 07:00:52.000000000 -0500
++++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c	2005-05-05 08:15:40.295056480 -0500
+@@ -61,8 +61,6 @@
+ FILE	*auth_file;
+ Xauth	*auth;
+ {
+-    char    *malloc ();
+-
+     if (write_short (auth->family, auth_file) == 0)
+ 	return 0;
+     if (write_counted_string (auth->address_length, auth->address, auth_file) == 0)
+diff -urN vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c
+--- vnc_unixsrc.orig/Xvnc/lib/Xdmcp/Alloc.c	2000-06-11 07:00:52.000000000 -0500
++++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c	2005-05-05 08:15:58.108348448 -0500
+@@ -31,8 +31,6 @@
+ 
+ /* stubs for use when Xalloc, Xrealloc and Xfree are not defined */
+ 
+-extern char	*malloc (), *realloc ();
+-
+ unsigned long *
+ Xalloc (amount)
+     unsigned	amount;