new version + gcc3.4 fix, thanks Magnade

5 files changed, 129 insertions, 0 deletions

diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5 b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5
new file mode 100644
index 000000000000..cacf52526b8e
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5
@@ -0,0 +1 @@
+MD5 bdcae6956ae382e5aca6cb708d085766 tightvnc-1.3dev5_unixsrc.tar.bz2 1762386
diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gcc34.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gcc34.patch
new file mode 100644
index 000000000000..50e577a71753
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gcc34.patch
@@ -0,0 +1,52 @@
+--- vnc_unixsrc/Xvnc/lib/Xau/AuRead.c.old	2004-09-17 20:34:15.226303649 -0700
++++ vnc_unixsrc/Xvnc/lib/Xau/AuRead.c	2004-09-17 20:34:31.743582524 -0700
+@@ -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;
+--- vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c.old	2004-09-17 20:37:50.192903801 -0700
++++ vnc_unixsrc/Xvnc/lib/Xau/AuWrite.c	2004-09-17 20:37:58.067083299 -0700
+@@ -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)
+--- vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c.old	2004-09-17 20:35:33.598137184 -0700
++++ vnc_unixsrc/Xvnc/lib/Xdmcp/Alloc.c	2004-09-17 20:35:40.435424729 -0700
+@@ -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;
+--- vnc_unixsrc/Xvnc/include/Xpoll.h.old	2004-09-19 18:10:11.646953351 -0700
++++ vnc_unixsrc/Xvnc/include/Xpoll.h	2004-09-19 18:31:06.019245838 -0700
+@@ -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 --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.diff
new file mode 100644
index 000000000000..417df8a36990
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.diff
@@ -0,0 +1,19 @@
+--- vncserver.orig	2004-05-30 17:09:53.000000000 +0200
++++ vncserver	2004-06-19 14:01:21.386221926 +0200
+@@ -36,13 +36,13 @@
+ $geometry = "1024x768";
+ $depth = 24;
+ $desktopName = "X";
+-$vncClasses = "/usr/local/vnc/classes";
++$vncClasses = "/usr/share/tightvnc/classes";
+ $vncUserDir = "$ENV{HOME}/.vnc";
+-$fontPath = "unix/:7100";
++$fontPath = "unix/:-1";
+ $authType = "-rfbauth $vncUserDir/passwd";
+ 
+ # Here is another example of setting the font path:
+-# $fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
++$fontPath = "/usr/lib/X11/fonts/misc/,/usr/lib/X11/fonts/75dpi/";
+ 
+ # X colors database path is optional, uncomment and edit to use:
+ # $colorPath = "/usr/lib/X11/rgb";
diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.security.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.security.patch
new file mode 100644
index 000000000000..ab65aec892f9
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-gentoo.security.patch
@@ -0,0 +1,20 @@
+--- /tmp/vncserver	2003-02-21 17:29:45.000000000 +0000
++++ vncserver	2003-02-21 17:30:10.000000000 +0000
+@@ -153,15 +153,8 @@
+ $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)));
+-}
++# Make an X server cookie - use mcookie
++$cookie = `/usr/bin/mcookie`;
+ 
+ system("xauth -f $xauthorityFile add $host:$displayNumber . $cookie");
+ system("xauth -f $xauthorityFile add $host/unix:$displayNumber . $cookie"); 
diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha5-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-imake-tmpdir.patch
new file mode 100644
index 000000000000..9d5ccc58ad76
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha5-imake-tmpdir.patch
@@ -0,0 +1,37 @@
+--- vnc_unixsrc/Xvnc/config/imake/imake.c.orig	2000-06-11 14:00:51.000000000 +0200
++++ vnc_unixsrc/Xvnc/config/imake/imake.c	2003-09-01 22:59:25.000000000 +0200
+@@ -913,12 +913,25 @@
+ static void get_libc_version(inFile)
+   FILE* inFile;
+ {
+-  char *aout = tmpnam (NULL);
++  char aout[PATH_MAX];
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
+   int len;
+   char *command;
++  char *tmpdir;
++  int tmpfd;
++  
++  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (PATH_MAX-13))
++    strcpy(aout, tmpdir);
++  else
++    strcpy(aout, "/tmp");
++  strcat(aout, "/imakeXXXXXX");
++  
++  if((tmpfd = mkstemp(aout)) == -1) {
++    perror("mkstemp");
++    abort();
++  }
+ 
+   cc = getenv ("CC");
+   if (cc == NULL)
+@@ -930,6 +943,7 @@
+   if (snprintf (command , len, format, cc, aout) == len)
+     abort ();
+ 
++  close(tmpfd);
+   fp = popen (command, "w");
+   if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0
+       || pclose (fp) != 0)