Closing #22356

4 files changed, 49 insertions, 23 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 726c66ab5869..717debf8af9b 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/vnc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.21 2003/08/20 03:23:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.22 2003/11/21 15:52:17 aliz Exp $
+
+  21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> vnc-3.3.7.ebuild :
+  Copied patch from tightvnc that fixes compilation if /tmp is set noexec. Closing #22356.
 
   09 Jun 2003; Jason Wever <weeve@gentoo.org> vnc-3.3.3-r2.ebuild,
   vnc-3.3.3-r3.ebuild, vnc-3.3.4.ebuild, vnc-3.3.5-r1.ebuild,
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index 3294a0b16d29..27d0ce012faa 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,23 +1,8 @@
-MD5 eabad10785bacef3a1cc9f63565dcbf0 ChangeLog 4600
-MD5 481f697c1b42f2486ca01fc284e10e6f vnc-3.3.3-r2.ebuild 1395
-MD5 b7cb51a6ca2849ec7176a75731ee2470 vnc-3.3.3-r3.ebuild 1725
-MD5 aaee8f362dd54da0841c3ed916a5cd10 vnc-3.3.4.ebuild 1096
-MD5 35bd4e89aea914a472a34e09f813ec7a vnc-3.3.5-r1.ebuild 1151
-MD5 4b25551a558bbd6f39f5a441190ece20 vnc-3.3.5.ebuild 1074
-MD5 73e13fd6e7e1c3ff7dff7d0eee3f9d8c vnc-3.3.6-r1.ebuild 1233
-MD5 b391455ba5928fad9a31c20cb0d81770 vnc-3.3.6.ebuild 1126
-MD5 76162fb21b49eeb3d4a0284cf639a0c9 vnc-3.3.7.ebuild 1468
-MD5 0500fd80d883cdf59502ee75bcaebe8c files/digest-vnc-3.3.3-r2 69
-MD5 f4d67a9df5270478bed6c9efef95c41c files/digest-vnc-3.3.3-r3 217
-MD5 070d7f83ec9decb351904a2df89a5386 files/digest-vnc-3.3.4 70
-MD5 ae8c043b1096518a3ea3ebfe1b32dee1 files/digest-vnc-3.3.5 70
-MD5 ae8c043b1096518a3ea3ebfe1b32dee1 files/digest-vnc-3.3.5-r1 70
-MD5 1e3e45d8afc3b2fd06ce8a7b38ede4ac files/digest-vnc-3.3.6 70
-MD5 1e3e45d8afc3b2fd06ce8a7b38ede4ac files/digest-vnc-3.3.6-r1 70
-MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
-MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.6-gentoo.security.patch 781
-MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
-MD5 52e6615935c018d2cd57c5b5e28b6f56 files/vncviewer-makefile-3.3.3r2 23959
+MD5 031b6d705c812d72ded1dbe8bbf89b41 vnc-3.3.7.ebuild 1608
+MD5 c0c41f5a18c496e8f7a267fe669a938b ChangeLog 4757
 MD5 a30c29b08a93f6fb42177887aa132e18 files/vnc-3.3.3-10-xdm-auth-support.patch 11575
-MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
 MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005
+MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
+MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
+MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
+MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
diff --git a/net-misc/vnc/files/vnc-3.3.7-imake-tmpdir.patch b/net-misc/vnc/files/vnc-3.3.7-imake-tmpdir.patch
new file mode 100644
index 000000000000..9d5ccc58ad76
--- /dev/null
+++ b/net-misc/vnc/files/vnc-3.3.7-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/vnc/vnc-3.3.7.ebuild b/net-misc/vnc/vnc-3.3.7.ebuild
index 56dd83a421d3..3f5ba404977f 100644
--- a/net-misc/vnc/vnc-3.3.7.ebuild
+++ b/net-misc/vnc/vnc-3.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.8 2003/11/11 15:58:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.9 2003/11/21 15:52:17 aliz Exp $
 
 inherit eutils
 
@@ -25,6 +25,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/${P}-gentoo.security.patch
+	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 	if [ "${ARCH}" = "sparc" ]
 	then
 		epatch ${FILESDIR}/vnc-3.3.3r2-getline-fix.patch