diff options
author | 2007-02-06 14:07:22 +0000 | |
---|---|---|
committer | 2007-02-06 14:07:22 +0000 | |
commit | b8ffa3043ccd600cd34dbd02fa5e1a2a7729b22c (patch) | |
tree | 704c8c66c0d2f10e63ef55c8552e0ef6c2d610ff /net-misc | |
parent | Stable for HPPA (bug #165610). (diff) | |
download | gentoo-2-b8ffa3043ccd600cd34dbd02fa5e1a2a7729b22c.tar.gz gentoo-2-b8ffa3043ccd600cd34dbd02fa5e1a2a7729b22c.tar.bz2 gentoo-2-b8ffa3043ccd600cd34dbd02fa5e1a2a7729b22c.zip |
drop old
(Portage version: 2.1.2-r8)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/tightvnc/ChangeLog | 11 | ||||
-rw-r--r-- | net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 | 3 | ||||
-rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch | 169 | ||||
-rw-r--r-- | net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch | 24 | ||||
-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/files/vncserver-1.3.patch | 15 | ||||
-rw-r--r-- | net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild | 101 |
9 files changed, 10 insertions, 389 deletions
diff --git a/net-misc/tightvnc/ChangeLog b/net-misc/tightvnc/ChangeLog index c2c1e54183f4..4543169dd9cc 100644 --- a/net-misc/tightvnc/ChangeLog +++ b/net-misc/tightvnc/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/tightvnc # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.87 2007/02/06 13:58:04 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/tightvnc/ChangeLog,v 1.88 2007/02/06 14:07:22 armin76 Exp $ + + 06 Feb 2007; Raúl Porcel <armin76@gentoo.org> + -files/tightvnc-1.3_alpha7-amd64.patch, + -files/tightvnc-1.3_alpha7-darwin.patch, + -files/tightvnc-1.3_alpha7-gentoo.diff, + -files/tightvnc-1.3_alpha7-gentoo.security.patch, + -files/tightvnc-1.3_alpha7-imake-tmpdir.patch, -files/vncserver-1.3.patch, + -tightvnc-1.3_alpha7.ebuild: + drop old 06 Feb 2007; Jeroen Roovers <jer@gentoo.org> tightvnc-1.3.8.ebuild: Stable for HPPA (bug #165610). diff --git a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 b/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 deleted file mode 100644 index b4cae558830d..000000000000 --- a/net-misc/tightvnc/files/digest-tightvnc-1.3_alpha7 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 8e9e63f19d8351a5359c0cc15d96c18c tightvnc-1.3dev7_unixsrc.tar.bz2 1764364 -RMD160 348edffc87254392f8ebcd1e3cc14fffda8b33ba tightvnc-1.3dev7_unixsrc.tar.bz2 1764364 -SHA256 ed1eed5127e4d04f2cf81ee1d7aaf7cbf5201d80dcd0cf91a8a4ef77de4c6bdb tightvnc-1.3dev7_unixsrc.tar.bz2 1764364 diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch deleted file mode 100644 index c1473bfe1416..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-amd64.patch +++ /dev/null @@ -1,169 +0,0 @@ -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/files/tightvnc-1.3_alpha7-darwin.patch b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch deleted file mode 100644 index e5f7aa7016cf..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-darwin.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- vnc_unixsrc/Xvnc/config/cf/darwin.cf.orig 2005-11-05 16:42:53.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/darwin.cf 2005-11-05 16:46:52.000000000 +0100 -@@ -106,7 +106,6 @@ - # endif - #endif - --#define StandardDefines -DCSRG_BASED - #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC - - ---- vnc_unixsrc/Xvnc/config/cf/vnclibs.def.orig 2005-11-05 17:11:41.000000000 +0100 -+++ vnc_unixsrc/Xvnc/config/cf/vnclibs.def 2005-11-05 17:17:21.000000000 +0100 -@@ -11,7 +11,11 @@ - /* Avoid linking with different libjpeg in /usr/shlib under Tru64. */ - VNCSYSLIBS = /usr/local/lib/libjpeg.a /usr/local/lib/libz.a -lcrypt - #else -+# if HasLibCrypt == YES - VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -lcrypt -+# else -+VNCSYSLIBS = -L/usr/local/lib -ljpeg -lz -+# endif - #endif - - VNCCPPFLAGS = -I$(TOP)/../include -I/usr/local/include diff --git a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff b/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff deleted file mode 100644 index 417df8a36990..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index ab65aec892f9..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-gentoo.security.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /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 deleted file mode 100644 index 9d5ccc58ad76..000000000000 --- a/net-misc/tightvnc/files/tightvnc-1.3_alpha7-imake-tmpdir.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- 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/files/vncserver-1.3.patch b/net-misc/tightvnc/files/vncserver-1.3.patch deleted file mode 100644 index 945e297130b4..000000000000 --- a/net-misc/tightvnc/files/vncserver-1.3.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- vncserver 2006-04-05 10:01:29.000000000 +0200 -+++ vncserver 2006-04-09 19:05:11.000000000 +0200 -@@ -38,11 +38,10 @@ - $desktopName = "X"; - $vncClasses = "/usr/share/tightvnc/classes"; - $vncUserDir = "$ENV{HOME}/.vnc"; --$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/share/fonts/misc/,/usr/share/fonts/Type1/"; - - # X colors database path is optional, uncomment and edit to use: - # $colorPath = "/usr/lib/X11/rgb"; diff --git a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild b/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild deleted file mode 100644 index 47fe05c88962..000000000000 --- a/net-misc/tightvnc/tightvnc-1.3_alpha7.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# 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.9 2006/06/06 18:19:55 gmsoft Exp $ - -inherit eutils toolchain-funcs - -IUSE="java tcpd server" - -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="~alpha ~amd64 hppa ~ppc ~ppc-macos ~sparc ~x86" -LICENSE="GPL-2" -SLOT="0" - -DEPEND="|| ( ( x11-libs/libXaw - x11-proto/xextproto - >=x11-misc/imake-1 - x11-misc/gccmakedep - app-text/rman - server? ( x11-libs/libXp - x11-proto/inputproto - x11-proto/kbproto - x11-proto/printproto - x11-proto/scrnsaverproto - ) - ) - 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() { - - if ! use server; - then - echo - einfo "The 'server' USE flag will build tightvnc's server." - einfo "If '-server' is chosen only the client is built to save space." - einfo "Stop the build now if you need to add 'server' to USE flags.\n" - ebeep - epause 5 - fi - - 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" - epatch "${FILESDIR}/${P}-darwin.patch" - epatch "${FILESDIR}/vncserver-1.3.patch" - use amd64 && epatch "${FILESDIR}/${P}-amd64.patch" -} - -src_compile() { - xmkmf -a || die "xmkmf failed" - - make CDEBUGFLAGS="${CFLAGS}" World || die - - if use server; then - cd Xvnc && ./configure || die "Configure failed." - if use tcpd; then - local myextra="-lwrap" - use userland_Darwin || myextra="${myextra} -lnss_nis" - make EXTRA_LIBRARIES="${myextra}" \ - CDEBUGFLAGS="${CFLAGS}" \ - EXTRA_DEFINES="-DUSE_LIBWRAP=1" || die - else - make CDEBUGFLAGS="${CFLAGS}" || die - fi - fi - -} - -src_install() { - # the web based interface and the java viewer need the java class files - if use java; then - insinto /usr/share/tightvnc/classes - doins classes/* - fi - - dodir /usr/share/man/man1 /usr/bin - ./vncinstall ${D}/usr/bin ${D}/usr/share/man || die "vncinstall failed" - - if ! use server; then - rm -f ${D}/usr/bin/vncserver - rm -f ${D}/usr/share/man/man1/{Xvnc,vncserver}* - fi - - dodoc ChangeLog README WhatsNew - use java && dodoc ${FILESDIR}/README.JavaViewer - newdoc vncviewer/README README.vncviewer -} |