diff options
author | Daniel Goller <morfic@gentoo.org> | 2005-08-06 14:35:11 +0000 |
---|---|---|
committer | Daniel Goller <morfic@gentoo.org> | 2005-08-06 14:35:11 +0000 |
commit | a2833e9d1dac9d0db0637414890ed968d22f11df (patch) | |
tree | cef04b0cda6ff238e7bf048427621929ffe1f142 /net-misc/tightvnc | |
parent | Ugly workaround (diff) | |
download | gentoo-2-a2833e9d1dac9d0db0637414890ed968d22f11df.tar.gz gentoo-2-a2833e9d1dac9d0db0637414890ed968d22f11df.tar.bz2 gentoo-2-a2833e9d1dac9d0db0637414890ed968d22f11df.zip |
Adding 1.3 dev 7
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'net-misc/tightvnc')
-rw-r--r-- | net-misc/tightvnc/ChangeLog | 11 | ||||
-rw-r--r-- | net-misc/tightvnc/Manifest | 15 | ||||
-rw-r--r-- | net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 | 1 | ||||
-rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff | 19 | ||||
-rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.security.patch | 20 | ||||
-rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3_alpha7-imake-tmpdir.patch | 37 | ||||
-rw-r--r-- | net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild | 61 |
7 files changed, 153 insertions, 11 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog index ff8fb819f13d..31737fff5281 100644 --- a/net-misc/tightvnc/ChangeLog +++ b/net-misc/tightvnc/ChangeLog @@ -1,6 +1,15 @@ # 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.50 2005/07/27 07:38:15 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.51 2005/08/06 14:35:11 morfic Exp $ + +*tightvnc-1.3_alpha7 (06 Aug 2005) + + 06 Aug 2005; Daniel Goller <morfic@gentoo.org> + +files/tightvnc-1.3_alpha7-gentoo.diff, + +files/tightvnc-1.3_alpha7-gentoo.security.patch, + +files/tightvnc-1.3_alpha7-imake-tmpdir.patch, + +tightvnc-1.3_alpha7.ebuild: + Added 1.3 dev 7 27 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> tightvnc-1.3_alpha5.ebuild: diff --git a/net-misc/tightvnc/Manifest b/net-misc/tightvnc/Manifest index 074369f96eab..6a0ccaa9353f 100644 --- a/net-misc/tightvnc/Manifest +++ b/net-misc/tightvnc/Manifest @@ -1,11 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 1f4dea7eded899c433442e1b1da2bc07 ChangeLog 6726 MD5 59a8848188e5992cbe142be7d6285ee5 metadata.xml 309 MD5 ad61c2374702756a5341de9f1a63efda tightvnc-1.2.8.ebuild 1595 MD5 3cc698e0e4dc7d3c778411161b5af86d tightvnc-1.2.9-r1.ebuild 1717 MD5 c3388af0849a29205dbf0a090a78f2c4 tightvnc-1.3_alpha5.ebuild 1871 +MD5 8024a506665c17e4db049f4ce53264a8 tightvnc-1.3_alpha7.ebuild 1804 MD5 68903d8d341d5f9a8d576dee0716f4b8 files/README.JavaViewer 18585 MD5 11be6d47e594297c9a92c56056df2f73 files/digest-tightvnc-1.2.8 76 MD5 db5ea3a3551303c5cd4362c657ba3a08 files/digest-tightvnc-1.2.9-r1 76 @@ -25,13 +23,10 @@ MD5 e6b8161e8381fd5be315641819de6425 files/tightvnc-4.0_linux-headers.patch 1359 MD5 fba34335858b6b6b681a660c7c74273f files/tightvnc-gentoo.diff 636 MD5 e77df1134e59b0a9881ef1221eeffd37 files/tightvnc_cvs20031113.patch.bz2 19007 MD5 1ddf3e5ec0121aaca487686a7bb6dd55 files/x86.patch 1613 +MD5 255c92e5784a2fe1c9fe7283f4a54d34 files/tightvnc-1.3_alpha7-gentoo.diff 697 +MD5 57e1cd8ec91d0e8abbea5b267a6f1fb6 files/tightvnc-1.3_alpha7-gentoo.security.patch 771 +MD5 b801cfcb63f9c7c9299dd4919ba332b9 files/tightvnc-1.3_alpha7-imake-tmpdir.patch 956 +MD5 e972798c3780581c31b4c0a4b35dfbb6 files/digest-tightvnc-1.3_alpha7 78 MD5 19c42aff4dfa179a0b028316e845e14f files/4.0/0121_all_4.2.99.3-build-libs-with-pic.patch 949 MD5 55068075897cef6ddd710f410ba25c21 files/4.0/0160_all_4.2.99.4-IncludeSharedObjectInNormalLib.patch 1692 MD5 da10d05f6a76bdc27a59276c0acde9d9 files/4.0/0180_amd64_4.2.99.4-glx-nopic.patch 364 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC5zoJArHZZzCEUG0RAj8+AJ0aAwbssSP2N/lT6l9lcT7AnwTbbwCdHqlT -t/rf6b/EExbmjxRnctxgGn4= -=Lfq/ ------END PGP SIGNATURE----- diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 new file mode 100644 index 000000000000..068c11b37fa6 --- /dev/null +++ b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 @@ -0,0 +1 @@ +MD5 8e9e63f19d8351a5359c0cc15d96c18c tightvnc-1.3dev7_unixsrc.tar.bz2 1764364 diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff new file mode 100644 index 000000000000..417df8a36990 --- /dev/null +++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-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_alpha7-gentoo.security.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.security.patch new file mode 100644 index 000000000000..ab65aec892f9 --- /dev/null +++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-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_alpha7-imake-tmpdir.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-imake-tmpdir.patch new file mode 100644 index 000000000000..9d5ccc58ad76 --- /dev/null +++ b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-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_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild new file mode 100644 index 000000000000..767891427b45 --- /dev/null +++ b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild @@ -0,0 +1,61 @@ +# 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_alpha7.ebuild,v 1.1 2005/08/06 14:35:11 morfic 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 +} + +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 +} |