Closing #677565, #63596, #71295 and #69277.

9 files changed, 221 insertions, 41 deletions

diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog
index 3f49b7a601ec..fddba6d92c32 100644
--- a/net-misc/vnc/ChangeLog
+++ b/net-misc/vnc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-misc/vnc
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.29 2004/09/15 22:29:16 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.30 2005/01/07 18:12:04 aliz Exp $
+
+*vnc-4.0-r1 (07 Jan 2005)
+
+  07 Jan 2005; Daniel Ahlberg <aliz@gentoo.org>
+  files/vnc-4.0/vnc-xorg.patch, +vnc-4.0-r1.ebuild, vnc-4.0.ebuild, +imake-tmpdir.patch,
+  vnc-xorg-x11-fixes.patch:
+  Revision bump to use X.Org 6.8.1, closing #67565.
+  Create /usr/X11R6/lib/modules/extensions so that .so file gets installed, closing #63596.
+  Added patch to prevent /tmp execution, closing #71295.
+  Don't hardcode CC/CXX, closing #69277.
+  Updated SRC_URI to xorg.freedesktop.org.
 
   15 Sep 2004; <agriffis@gentoo.org> vnc-4.0.ebuild:
   stable on amd64
diff --git a/net-misc/vnc/Manifest b/net-misc/vnc/Manifest
index ea9d1da684c5..574b31ba8be0 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -1,22 +1,26 @@
-MD5 15f31577b07b8dd58216909156514222 ChangeLog 5524
-MD5 71a89ebfb9464390ce02a3c7815ad35f vnc-3.3.7.ebuild 1632
-MD5 fed744226b8ec912faff49015293333f vnc-4.0.ebuild 1887
+MD5 6d56c554001dec424bca1aa93cca7433 vnc-4.0-r1.ebuild 2198
+MD5 9f66c7decfb747aef1c43e2df6a85757 vnc-4.0.ebuild 2089
+MD5 6f59f15a8b013fa3c8897c311ae596ff vnc-3.3.7.ebuild 1628
+MD5 97d555a714a8313cdeeb9640b2217e49 ChangeLog 5998
 MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
-MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
 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 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
 MD5 69dfbaa72c6b66cba94868885c09fc92 files/vnc-3.3.4-platform-fixes.patch 63005
+MD5 80e10f3892c66ccd2442eda86402e9b4 files/vnc-3.3.3r2-getline-fix.patch 1205
+MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
 MD5 28351e92e98f2a72662d937ce2889d14 files/vnc-3.3.7-gentoo.security.patch 781
 MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/vnc-3.3.7-imake-tmpdir.patch 956
-MD5 aa54243fe6893130280fe1224204b780 files/digest-vnc-4.0 270
-MD5 7c75fc548aa928b203396bc80a301d6c files/xc.patch-cfbglblt8.patch 1738
+MD5 34d3a675951dc585f220fe946a5985df files/digest-vnc-3.3.7 70
+MD5 bc74b6827faf0e3039de99a4e21cc5bd files/digest-vnc-4.0-r1 270
 MD5 0959d633e7ca36b8995398b1ba1e315c files/vnc-4.0/vnc-cookie.patch 819
-MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
-MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
-MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
 MD5 ec954c0400a90b9de9d5d59db4c7eefb files/vnc-4.0/vnc-idle.patch 482
-MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
-MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
 MD5 6572073121cd6b24eb72ec9df69927e0 files/vnc-4.0/vnc-via.patch 5681
+MD5 5f386c352a0c2fb8298434174b7f4691 files/vnc-4.0/vnc-def.patch 365
+MD5 43179a2e046f430fea7d2bc617dce6b0 files/vnc-4.0/vnc-xorg.patch 3440
+MD5 1e5a138be84b8e2c04c8c35b3e59f2d2 files/vnc-4.0/vnc-xorg-x11-fixes.patch 1216
 MD5 a47315b0d740135ce27a952e00a0438f files/vnc-4.0/vnc-xclients.patch 557
-MD5 41371ecab498cd03bee95203efd160b9 files/vnc-4.0/vnc-xorg.patch 2783
+MD5 33601310b3a1040e1d836d1648e84b41 files/vnc-4.0/imake-tmpdir.patch 1062
+MD5 999db9342ac0003537daee1f4193fd92 files/vnc-4.0/vnc-sparc.patch 1244
+MD5 7237b4f63e22a412ecba796be21e218d files/vnc-4.0/vnc-gcc34.patch 5911
+MD5 79e22af66b56cf67fa9e517ad69c8f71 files/vnc-4.0/vnc-restart.patch 698
+MD5 ff4f3d8258e8e4612c637b86fcc50605 files/vnc-4.0/vnc-fPIC.patch 2401
diff --git a/net-misc/vnc/files/digest-vnc-4.0-r1 b/net-misc/vnc/files/digest-vnc-4.0-r1
new file mode 100644
index 000000000000..fdd7c356f4cf
--- /dev/null
+++ b/net-misc/vnc/files/digest-vnc-4.0-r1
@@ -0,0 +1,4 @@
+MD5 e8e79964b76e09e3a19c35cceb9e24b3 vnc-4.0-unixsrc.tar.gz 482518
+MD5 e352319d423391ff2c03bb7f81fe8d2b X11R6.8.1-src1.tar.gz 30562401
+MD5 6ba36becf1133c61a88c92e1d60c19ed X11R6.8.1-src2.tar.gz 5808949
+MD5 8578e566e909e7c40300f44b6f0e88d3 X11R6.8.1-src3.tar.gz 10014808
diff --git a/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch b/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
new file mode 100644
index 000000000000..209cb15bf543
--- /dev/null
+++ b/net-misc/vnc/files/vnc-4.0/imake-tmpdir.patch
@@ -0,0 +1,37 @@
+--- xc/config/imake/imake.c.orig	2001-12-14 20:53:18.000000000 +0100
++++ xc/config/imake/imake.c	2003-09-12 15:00:10.000000000 +0200
+@@ -985,13 +985,23 @@
+ static void
+ get_libc_version(FILE *inFile)
+ {
+-  char aout[] = "/tmp/imakeXXXXXX";
++  char aout[4096], *tmpdir;
+   FILE *fp;
+   const char *format = "%s -o %s -x c -";
+   char *cc;
+   int len;
+   char *command;
+ 
++  /* If $TMPDIR is defined and has an acceptable length,
++   * use that as tmp dir, else use /tmp.  That fixes 
++   * problems with /tmp mounted "noexec".
++   */
++  if((tmpdir = getenv("TMPDIR")) != NULL && strlen(tmpdir) < (4096-13))
++    strcpy(aout, tmpdir);
++  else
++    strcpy(aout, "/tmp");
++  strcat(aout, "/imakeXXXXXX");
++
+   /* Pre-create temp file safely */
+   {
+     /* Linux + ELF has mkstemp() */
+@@ -1007,7 +1017,8 @@
+     cc = "gcc";
+   len = strlen (aout) + strlen (format) + strlen (cc);
+   if (len < 128) len = 128;
+-  command = alloca (len);
++  if((command = alloca (len)) == NULL)
++    abort();
+ 
+   if (snprintf (command , len, format, cc, aout) == len)
+     abort ();
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
new file mode 100644
index 000000000000..a4cb39e32d0e
--- /dev/null
+++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg-x11-fixes.patch
@@ -0,0 +1,22 @@
+--- vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile.xorg-x11-fixes	2004-11-18 16:17:02.808464254 +0000
++++ vnc-4.0-unixsrc/xc/programs/Xserver/hw/xfree86/Imakefile	2004-11-18 16:17:03.925252687 +0000
+@@ -92,7 +92,7 @@
+           $(XF8_32BPPDIR) $(XF8_16BPPDIR) $(XF24_32BPPDIR) $(SHADOWFBDIR) \
+ 	  drivers $(LOADERDIR) $(VGAHWDIR) $(FBDEVHWDIR) $(RAMDACDIR) \
+ 	  $(RACDIR) $(DDCDIR) $(INPUTDIR) $(INT10DIR) $(VBEDIR) parser \
+-          scanpci doc dummylib $(XF86CFGDIRS) etc $(DRIVERSDK) \
++          scanpci doc dummylib $(XF86CFGDIRS) $(DRIVERSDK) \
+ 	  $(XF8_32WIDDIR) getconfig
+ 
+ #if !defined(OS2Architecture) && !defined(cygwinArchitecture)
+--- vnc-4.0-unixsrc/xc/extras/rman/rman.c.xorg-x11-fixes	2004-04-23 19:42:56.000000000 +0100
++++ vnc-4.0-unixsrc/xc/extras/rman/rman.c	2004-11-18 09:53:56.000000000 +0000
+@@ -211,7 +211,7 @@
+ const char TABLEOFCONTENTS[] = "Table of Contents";
+ const char HEADERANDFOOTER[] = "Header and Footer";
+ char manName[80] = "man page";
+-char manSect[10] = "1";
++char manSect[30] = "1";
+ const char PROVENANCE[] =
+ 	"manual page source format generated by PolyglotMan v" POLYGLOTMANVERSION;
+ const char HOME[] = "available at http://polyglotman.sourceforge.net/";
diff --git a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
index d7a46223ab3c..cd749c5398c3 100644
--- a/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
+++ b/net-misc/vnc/files/vnc-4.0/vnc-xorg.patch
@@ -37,25 +37,6 @@
  #endif
  
  #if BuildXprint
---- vnc-4.0b4-unixsrc/xc.patch.xorg	2004-03-23 10:53:05.000000000 +0000
-+++ vnc-4.0b4-unixsrc/xc.patch	2004-03-23 10:53:42.000000000 +0000
-@@ -8,11 +8,11 @@
- + XCOMM
- + XCOMM X VNC server
- + XCOMM
--+ MFBDIR = mfb
--+ CFB8DIR = cfb
--+ CFB16DIR = cfb16
--+ CFB24DIR = cfb24
--+ CFB32DIR = cfb32
-++ MFBSUBDIR = mfb
-++ CFB8SUBDIR = cfb
-++ CFB16SUBDIR = cfb16
-++ CFB24SUBDIR = cfb24
-++ CFB32SUBDIR = cfb32
- + XVNCDDXDIR = vnc/Xvnc
- + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
- + 	    $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
 --- vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h.xorg	2003-05-30 11:42:38.000000000 +0100
 +++ vnc-4.0b5-unixsrc/xc/programs/Xserver/vnc/RegionHelper.h	2004-05-27 11:26:06.499536143 +0100
 @@ -36,7 +36,7 @@
@@ -78,3 +59,43 @@
      } else {
        REGION_INIT(pScreen, reg, rect, size);
      }
+--- vnc-4.0-unixsrc/xc.patch.xorg	2004-08-25 16:10:52.131987786 +0100
++++ vnc-4.0-unixsrc/xc.patch	2004-08-25 16:12:23.896276533 +0100
+@@ -8,11 +8,11 @@
+ + XCOMM
+ + XCOMM X VNC server
+ + XCOMM
+-+ MFBDIR = mfb
+-+ CFB8DIR = cfb
+-+ CFB16DIR = cfb16
+-+ CFB24DIR = cfb24
+-+ CFB32DIR = cfb32
+++ MFBSUBDIR = mfb
+++ CFB8SUBDIR = cfb
+++ CFB16SUBDIR = cfb16
+++ CFB24SUBDIR = cfb24
+++ CFB32SUBDIR = cfb32
+ + XVNCDDXDIR = vnc/Xvnc
+ + XVNCDIRS = $(STDDIRS) $(MFBDIR) \
+ +          $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR) \
+--- vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc.xorg	2004-08-31 14:24:12.140503335 +0100
++++ vnc-4.0-unixsrc/xc/programs/Xserver/vnc/Xvnc/xvnc.cc	2004-08-31 14:24:45.189675775 +0100
+@@ -201,6 +201,7 @@
+ }
+ 
+ extern "C" {
++  void ddxInitGlobals() {}
+   void ddxGiveUp()
+   {
+     int i;
+--- vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:55:57.732303799 +0100
++++ vnc-4.0-unixsrc/xc/config/cf/vnc.def	2004-09-29 15:56:30.495034234 +0100
+@@ -9,6 +9,8 @@
+ #define XnestServer YES
+ #define XF86Server NO
+ #define XprtServer NO
++#define BuildXFree86ConfigTools NO
++#define BuildScanpci NO
+ 
+ #ifdef SunArchitecture
+ #define ProjectRoot /usr/openwin
diff --git a/net-misc/vnc/vnc-3.3.7.ebuild b/net-misc/vnc/vnc-3.3.7.ebuild
index 1e5ed3029056..f2b31d7ac7f2 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-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # 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.13 2004/06/25 00:18:37 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-3.3.7.ebuild,v 1.14 2005/01/07 18:12:04 aliz Exp $
 
 inherit eutils
 
diff --git a/net-misc/vnc/vnc-4.0-r1.ebuild b/net-misc/vnc/vnc-4.0-r1.ebuild
new file mode 100644
index 000000000000..05d711c19d9e
--- /dev/null
+++ b/net-misc/vnc/vnc-4.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0-r1.ebuild,v 1.1 2005/01/07 18:12:04 aliz Exp $
+
+inherit eutils toolchain-funcs
+
+X_VERSION="6.8.1"
+
+MY_P="${P}-unixsrc"
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.realvnc.com/"
+SRC_URI="http://www.realvnc.com/dist/${MY_P}.tar.gz
+	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src1.tar.gz
+	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src2.tar.gz
+	 http://xorg.freedesktop.org/X11R${X_VERSION}/src/X11R${X_VERSION}-src3.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+	media-libs/freetype
+	!virtual/vnc
+	x11-base/xorg-x11"
+
+PROVIDE="virtual/vnc"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	mkdir -p ${S}/xc ; cd ${S}
+
+	unpack X11R${X_VERSION}-src1.tar.gz
+	unpack X11R${X_VERSION}-src2.tar.gz
+	unpack X11R${X_VERSION}-src3.tar.gz
+
+	cd ${WORKDIR}
+	unpack ${MY_P}.tar.gz ; cd ${S}
+
+	# patches from Redhat
+	epatch ${FILESDIR}/${P}/vnc-cookie.patch
+	epatch ${FILESDIR}/${P}/vnc-def.patch
+	epatch ${FILESDIR}/${P}/vnc-fPIC.patch
+	epatch ${FILESDIR}/${P}/vnc-gcc34.patch
+	epatch ${FILESDIR}/${P}/vnc-idle.patch
+	epatch ${FILESDIR}/${P}/vnc-restart.patch
+	epatch ${FILESDIR}/${P}/vnc-sparc.patch
+	epatch ${FILESDIR}/${P}/vnc-via.patch
+	epatch ${FILESDIR}/${P}/vnc-xclients.patch
+	epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
+	epatch ${FILESDIR}/${P}/vnc-xorg.patch
+	epatch ${FILESDIR}/${P}/imake-tmpdir.patch
+
+	epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
+	epatch xc.patch
+
+	echo "#define CcCmd $(tc-getCC)" >> ${S}/xc/config/cf/vnc.def
+}
+
+src_compile() {
+	# client
+	econf --with-installed-zlib || die
+	emake || die
+
+	# server
+	cd ${S}/xc
+	make CDEBUGFLAGS="${CFLAGS}" CXXDEBUGFLAGS="${CXXFLAGS}" World FAST=1 || die
+}
+
+src_install() {
+	# client
+	dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions
+	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
+	dodoc LICENCE.TXT README
+
+	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
+}
diff --git a/net-misc/vnc/vnc-4.0.ebuild b/net-misc/vnc/vnc-4.0.ebuild
index 9877ff7616ef..01391269b8b0 100644
--- a/net-misc/vnc/vnc-4.0.ebuild
+++ b/net-misc/vnc/vnc-4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.4 2004/09/15 22:29:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.0.ebuild,v 1.5 2005/01/07 18:12:04 aliz Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 X_VERSION="6.7.0"
 
@@ -21,7 +21,8 @@ IUSE=""
 
 DEPEND="sys-libs/zlib
 	media-libs/freetype
-	!virtual/vnc"
+	!virtual/vnc
+	x11-base/xorg-x11"
 
 PROVIDE="virtual/vnc"
 S="${WORKDIR}/${MY_P}"
@@ -46,6 +47,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}/vnc-sparc.patch
 	epatch ${FILESDIR}/${P}/vnc-via.patch
 	epatch ${FILESDIR}/${P}/vnc-xclients.patch
+	epatch ${FILESDIR}/${P}/vnc-xorg-x11-fixes.patch
 	epatch ${FILESDIR}/${P}/vnc-xorg.patch
 
 	epatch ${FILESDIR}/xc.patch-cfbglblt8.patch
@@ -64,7 +66,9 @@ src_compile() {
 
 src_install() {
 	# client
-	dodir /usr/bin /usr/share/man/man1
+	dodir /usr/bin /usr/share/man/man1 /usr/X11R6/lib/modules/extensions
 	./vncinstall ${D}/usr/bin ${D}/usr/share/man ${D}/usr/X11R6/lib/modules/extensions || die
 	dodoc LICENCE.TXT README
+
+	ewarn "Note that the free VNC release is not designed for use on untrusted networks"
 }