closing #23843

5 files changed, 104 insertions, 3 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 49886ccfb58d..b37ad8caad92 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/tightvnc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.18 2003/08/07 12:35:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.19 2003/09/17 14:03:59 aliz Exp $
+
+*tightvnc-1.2.9-r1 (17 Sep 2003)
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> tightvnc-1.2.9-r1.ebuild :
+  Added patch from bartron <bartron@gmx.net>, closing #23843.
 
 *tightvnc-1.2.9 (07 Aug 2003)
 
diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest
index 7e57143dff53..8976cdb6ce51 100644
--- a/net-misc/tightvnc/Manifest
+++ b/net-misc/tightvnc/Manifest
@@ -1,10 +1,10 @@
-MD5 a75dea56663839f76fc07bf1f1fe845f ChangeLog 2986
+MD5 02530a7660d6026331749945f19cf66d ChangeLog 2986
 MD5 6436cd0c83384349f6106e6150d72964 tightvnc-1.2.3-r2.ebuild 1230
 MD5 f59a2d623ee3214e0abbf2038d657f26 tightvnc-1.2.6.ebuild 1330
 MD5 9aa1200bb5192b165843c3251df387ef tightvnc-1.2.7.ebuild 1550
 MD5 aabc422807dc831faa049e754fe2a782 tightvnc-1.2.9.ebuild 1618
 MD5 e3d97376c0f029056522d630552f86f6 tightvnc-1.2.8.ebuild 1614
-MD5 5c6f4ef8d08d8400ba49741a380a43c3 tightvnc-1.2.9-r1.ebuild 1662
+MD5 5512221467f2c5bf8937cdaad68073dc tightvnc-1.2.9-r1.ebuild 1661
 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585
 MD5 9138c55d41bebf73ee177ef75fee2cd1 files/digest-tightvnc-1.2.3-r2 76
 MD5 451572c22930322934ee8f6a857f9630 files/digest-tightvnc-1.2.6 76
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1 b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1
new file mode 100644
index 000000000000..1900142fe09a
--- /dev/null
+++ b/net-misc/tightvnc/files/digest-tightvnc-1.2.9-r1
@@ -0,0 +1 @@
+MD5 f804b26c098625e3a2675a0aa7709e31 tightvnc-1.2.9_unixsrc.tar.bz2 1738256
diff --git a/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.2.9-imake-tmpdir.patch
new file mode 100644
index 000000000000..9d5ccc58ad76
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.2.9-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.2.9-r1.ebuild b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
new file mode 100644
index 000000000000..9495b5da36b1
--- /dev/null
+++ b/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.2.9-r1.ebuild,v 1.1 2003/09/17 14:03:59 aliz Exp $
+
+inherit eutils
+
+IUSE="java tcpd"
+
+S="${WORKDIR}/vnc_unixsrc"
+DESCRIPTION="A great client/server software package allowing remote network access to graphical desktops."
+SRC_URI="mirror://sourceforge/vnc-tight/${P}_unixsrc.tar.bz2"
+HOMEPAGE="http://www.tightvnc.com/"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND=">=x11-base/xfree-4.2.1
+	~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}/tightvnc-${PVR}-gentoo.diff
+	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
+}
+
+src_compile() {
+	xmkmf -a || die "xmkmf failed"
+
+	make CDEBUGFLAGS="$CFLAGS" World || die "make World failed"
+	cd Xvnc && ./configure || die "Configure failed."
+
+	if use tcpd; then
+		make EXTRA_LIBRARIES="-lwrap -lnss_nis" CDEBUGFLAGS="$CFLAGS" EXTRA_DEFINES="-DUSE_LIBWRAP=1"
+	else
+		make CDEBUGFLAGS="$CFLAGS"
+	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
+}