Applying patch to fix Xvnc crash as reported in Bug#82583

(Portage version: 2.0.53_rc7)

5 files changed, 180 insertions, 68 deletions

diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog
index 32c63fb3f3e0..446ad7d7d853 100644
--- a/net-misc/tightvnc/ChangeLog
+++ b/net-misc/tightvnc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/tightvnc
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.61 2005/12/17 23:16:29 joshuabaergen Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.62 2006/02/11 22:01:23 morfic Exp $
+
+  11 Feb 2006; Daniel Goller <morfic@gentoo.org>
+  +files/tightvnc-1.3_alpha7-amd64.patch, -tightvnc-1.3_alpha5.ebuild,
+  tightvnc-1.3_alpha7.ebuild:
+  Applying patch to fix Bug#82583, thanks to Bradley Broom.
+  Cleanup of old dev version.
 
   17 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   tightvnc-1.3_alpha7.ebuild:
diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5 b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5
deleted file mode 100644
index cacf52526b8e..000000000000
--- a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdcae6956ae382e5aca6cb708d085766 tightvnc-1.3dev5_unixsrc.tar.bz2 1762386
diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch
new file mode 100644
index 000000000000..c1473bfe1416
--- /dev/null
+++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch
@@ -0,0 +1,169 @@
+diff -rc vnc_unixsrc.org/Xvnc/config/cf/linux.cf vnc_unixsrc/Xvnc/config/cf/linux.cf
+*** vnc_unixsrc.org/Xvnc/config/cf/linux.cf	Tue Jan 31 11:22:43 2006
+--- vnc_unixsrc/Xvnc/config/cf/linux.cf	Tue Jan 31 22:37:34 2006
+***************
+*** 295,301 ****
+  #define OptimizedCDebugFlags	-O2
+  #define LinuxMachineDefines 	-D__x86_64__
+  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
+  #endif /* x86_64PCArchitecture */
+  
+  #ifdef ArmArchitecture
+--- 295,301 ----
+  #define OptimizedCDebugFlags	-O2
+  #define LinuxMachineDefines 	-D__x86_64__
+  #define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME -DPART_NET
+! #define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+  #endif /* x86_64PCArchitecture */
+  
+  #ifdef ArmArchitecture
+diff -rc vnc_unixsrc.org/Xvnc/include/Xmd.h vnc_unixsrc/Xvnc/include/Xmd.h
+*** vnc_unixsrc.org/Xvnc/include/Xmd.h	Sun Jun 11 07:00:52 2000
+--- vnc_unixsrc/Xvnc/include/Xmd.h	Tue Jan 31 15:15:02 2006
+***************
+*** 59,65 ****
+  #ifdef CRAY
+  #define WORD64				/* 64-bit architecture */
+  #endif
+! #if defined(__alpha) || defined(__alpha__)
+  #define LONG64				/* 32/64-bit architecture */
+  #endif
+  #ifdef __sgi
+--- 59,65 ----
+  #ifdef CRAY
+  #define WORD64				/* 64-bit architecture */
+  #endif
+! #if defined(__alpha) || defined(__alpha__) || defined(__x86_64__)
+  #define LONG64				/* 32/64-bit architecture */
+  #endif
+  #ifdef __sgi
+diff -rc vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c
+*** vnc_unixsrc.org/Xvnc/lib/font/bitmap/bdfread.c	Sun Jun 11 07:00:52 2000
+--- vnc_unixsrc/Xvnc/lib/font/bitmap/bdfread.c	Tue Jan 31 15:15:02 2006
+***************
+*** 79,85 ****
+                  byte,
+                  glyph,
+                  scan;
+!     int         sizes[GLYPHPADOPTIONS];
+  {
+      int         widthBits,
+                  widthBytes,
+--- 79,85 ----
+                  byte,
+                  glyph,
+                  scan;
+!     CARD32      sizes[GLYPHPADOPTIONS];
+  {
+      int         widthBits,
+                  widthBytes,
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/dix/dixutils.c	Sun Jun 11 07:00:51 2000
+--- vnc_unixsrc/Xvnc/programs/Xserver/dix/dixutils.c	Tue Jan 31 15:15:02 2006
+***************
+*** 404,409 ****
+--- 404,410 ----
+   */
+  void
+  NoopDDA(
++ #undef NeedVarargsPrototypes
+  #if NeedVarargsPrototypes
+      void* f, ...
+  #endif
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Apr  8 17:18:33 2003
+--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/httpd.c	Tue Jan 31 15:15:02 2006
+***************
+*** 39,44 ****
+--- 39,45 ----
+  #endif
+  #if USE_LIBWRAP
+  #include <tcpd.h>
++ #include <arpa/inet.h>
+  #endif
+  
+  #include "rfb.h"
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/init.c	Fri Feb 27 06:22:47 2004
+--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/init.c	Tue Jan 31 15:15:02 2006
+***************
+*** 80,85 ****
+--- 80,86 ----
+  #include <sys/param.h>
+  #include "dix.h"
+  #include "rfb.h"
++ #include <time.h>
+  
+  #ifdef CORBA
+  #include <vncserverctrl.h>
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/rfb.h	Fri Feb 27 06:22:47 2004
+--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/rfb.h	Tue Jan 31 15:15:02 2006
+***************
+*** 30,35 ****
+--- 30,36 ----
+  #include <rfbproto.h>
+  #include <vncauth.h>
+  #include <zlib.h>
++ #include <stdarg.h>
+  
+  /* It's a good idea to keep these values a bit greater than required. */
+  #define MAX_ENCODINGS 10
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/hw/vnc/sockets.c	Sun Oct 27 06:36:02 2002
+--- vnc_unixsrc/Xvnc/programs/Xserver/hw/vnc/sockets.c	Tue Jan 31 15:15:02 2006
+***************
+*** 42,47 ****
+--- 42,48 ----
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <netinet/in.h>
++ #include <arpa/inet.h>
+  #include <netinet/tcp.h>
+  #include <netdb.h>
+  #include <fcntl.h>
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/dix.h	Sun Jun 11 07:00:52 2000
+--- vnc_unixsrc/Xvnc/programs/Xserver/include/dix.h	Tue Jan 31 15:15:02 2006
+***************
+*** 479,484 ****
+--- 479,485 ----
+  );
+  
+  extern void NoopDDA(
++ #undef NeedVarargsPrototypes
+  #if NeedVarargsPrototypes
+      void *,
+      ...
+diff -rc vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h
+*** vnc_unixsrc.org/Xvnc/programs/Xserver/include/servermd.h	Wed Feb 19 10:39:54 2003
+--- vnc_unixsrc/Xvnc/programs/Xserver/include/servermd.h	Tue Jan 31 17:05:16 2006
+***************
+*** 374,379 ****
+--- 374,398 ----
+  #define NO_ONE_RECT
+  #endif
+  
++ /* Values for AMD Opteron and Intel 64 bit extensions. Copied from Alpha.
++  */
++ #ifdef __x86_64__
++ #  define BITMAP_SCANLINE_UNIT			64
++ # define BITMAP_SCANLINE_PAD 			64
++ # define LOG2_BITMAP_PAD			6
++ # define LOG2_BYTES_PER_SCANLINE_PAD		3
++ 
++ /* Add for handling protocol XPutImage and XGetImage; see comment in
++  * Alpha section.
++  */
++ #define INTERNAL_VS_EXTERNAL_PADDING
++ #define BITMAP_SCANLINE_UNIT_PROTO		32
++ 
++ #define BITMAP_SCANLINE_PAD_PROTO 	 	32
++ #define LOG2_BITMAP_PAD_PROTO			5
++ #define LOG2_BYTES_PER_SCANLINE_PAD_PROTO	2
++ #endif
++ 
+  #endif /* SVR4 / BSD / i386 */
+  
+  #if defined (linux) && defined (__mc68000__)
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
deleted file mode 100644
index 5facc688ee3c..000000000000
--- a/net-misc/tightvnc/tightvnc-1.3_alpha5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.16 2005/07/27 07:38:15 eradicator Exp $
-
-inherit eutils toolchain-funcs
-
-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/_alpha/dev}_unixsrc.tar.bz2"
-HOMEPAGE="http://www.tightvnc.com/"
-
-KEYWORDS="x86 ppc sparc ~amd64 alpha"
-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
-
-	[ "$(gcc-version)" == "3.4" ] && epatch ${FILESDIR}/${P}-gcc34.patch
-}
-
-src_compile() {
-	local CDEBUGFLAGS="${CFLAGS}"
-
-	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" CC="$(tc-getCC)" || die
-	else
-		make CDEBUGFLAGS="${CDEBUGFLAGS}" CC="$(tc-getCC)" || 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
-}
diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
index d2f8d9fd1901..3455603142fe 100644
--- a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
+++ b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.6 2005/12/17 23:16:29 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild,v 1.7 2006/02/11 22:01:23 morfic Exp $
 
 inherit eutils toolchain-funcs
 
@@ -56,6 +56,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-imake-tmpdir.patch
 	epatch ${FILESDIR}/x86.patch
 	epatch "${FILESDIR}/${P}"-darwin.patch
+	use amd64 && epatch ${FILESDIR}/${P}-amd64.patch
 }
 
 src_compile() {