new version + gcc3.4 fix, thanks Magnade

7 files changed, 205 insertions, 0 deletions

diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 217c6ef2e055..e9ea53339ae1 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,6 +1,7 @@
 MD5 4da94dff5ba93bb47826ce3f578f1cca tightvnc-1.2.8.ebuild 1605
 MD5 fdc7480acff3391ab1a511dda2774d78 tightvnc-1.2.9-r1.ebuild 1716
 MD5 778524cf028a58d7a58572b693d953df tightvnc-4.0_beta20031113.ebuild 2656
+MD5 f5a218503154e9390fb292ccef558a37 tightvnc-1.3_alpha5.ebuild 2035
 MD5 1f05c8c2f0334c2093a6c580292f2e18 ChangeLog 4870
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
 MD5 8a5968ab6bd3fdd835fe13c589e1cc4d files/digest-tightvnc-4.0_beta20031113 367
@@ -10,14 +11,19 @@ MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.2.9-imake-tmpdir.patch 956
 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.8-gentoo.security.patch 771
+MD5 4e84efe3429797daa190b7d29e9b5857 files/digest-tightvnc-1.3_alpha5 78
+MD5 70b94ceb3134edc412d70768b55661aa files/tightvnc-1.3_alpha5-gcc34.patch 1540
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.7-gentoo.diff 657
 MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.2.9-gentoo.security.patch 771
 MD5 e6b8161e8381fd5be315641819de6425 files/tightvnc-4.0_linux-headers.patch 1359
 MD5 e77df1134e59b0a9881ef1221eeffd37 files/tightvnc_cvs20031113.patch.bz2 19007
+MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha5-gentoo.security.patch 771
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
 MD5 30ed72145d7123d98a8687d1746cf087 files/tightvnc-4.0_gcc-3.4.patch 262
 MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76
 MD5 eb14fedcc3608a1384ef1cba6dbbf103 files/tightvnc-1.2.8-gentoo.diff 657
+MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha5-gentoo.diff 697
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha5-imake-tmpdir.patch 956
 MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364
 MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692
 MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949
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)
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
new file mode 100644
index 000000000000..afee6612fd87
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild,v 1.1 2004/09/20 02:05:13 morfic Exp $
+
+inherit eutils
+
+IUSE="java tcpd"
+
+DLFILE="`echo ${P} | sed s:_alpha:dev:`"
+
+S="${WORKDIR}/vnc_unixsrc"
+DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
+SRC_URI="mirror://sourceforge/vnc-tight/${DLFILE}_unixsrc.tar.bz2"
+HOMEPAGE="http://www.tightvnc.com/"
+
+#can't test on anything but x86
+KEYWORDS="~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/x11
+	~media-libs/jpeg-6b
+	sys-libs/zlib
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+	!net-misc/vnc"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	java? ( || ( >=virtual/jdk-1.3.1 >=virtual/jre-1.3.1 ) )"
+
+src_unpack() {
+	unpack ${A} && cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+	epatch ${FILESDIR}/x86.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	local CDEBUGFLAGS="${CFLAGS}"
+
+	use amd64 && CDEBUGFLAGS="${CDEBUGFLAGS} -m32 \
+		-L/emul/linux/x86/lib \
+		-L/emul/linux/x86/usr/lib/gcc-lib/i386-pc-linux-gnu/3.2.3 \
+		-L/emul/linux/x86/usr/lib -L/emul/linux/x86/usr/X11R6/lib"
+
+	xmkmf -a || die "xmkmf failed"
+
+	make CDEBUGFLAGS="${CDEBUGFLAGS}" World || die "make World failed"
+	cd Xvnc && ./configure || die "Configure failed."
+
+	if use tcpd; then
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="${CDEBUGFLAGS}" EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die
+	else
+		make CDEBUGFLAGS="${CDEBUGFLAGS}" || die
+	fi
+}
+
+src_install() {
+	# the web based interface and the java viewer need the java class files
+	insinto /usr/share/tightvnc/classes ; doins classes/*
+
+	dodir /usr/share/man/man1 /usr/bin
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed"
+
+	dodoc ChangeLog README WhatsNew
+	use java && dodoc ${FILESDIR}/README.JavaViewer
+	newdoc vncviewer/README README.vncviewer
+}