Version bump for security #76019.

6 files changed, 19 insertions, 103 deletions

diff --git a/net-libs/libvncserver/ChangeLog b/net-libs/libvncserver/ChangeLog
index b3e6fd34e2d0..27fe8ab64cee 100644
--- a/net-libs/libvncserver/ChangeLog
+++ b/net-libs/libvncserver/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libvncserver
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.6 2004/08/11 22:42:35 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/ChangeLog,v 1.7 2004/12/29 20:01:58 vapier Exp $
+
+*libvncserver-0.7 (29 Dec 2004)
+
+  29 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/0.5-optional-configure.ac.patch, -libvncserver-0.6.ebuild,
+  +libvncserver-0.7.ebuild:
+  Version bump for security #76019.
 
   11 Aug 2004; Tom Martin <slarti@gentoo.org> libvncserver-0.6.ebuild:
   Marked ~amd64.
diff --git a/net-libs/libvncserver/Manifest b/net-libs/libvncserver/Manifest
deleted file mode 100644
index c4d384dca97f..000000000000
--- a/net-libs/libvncserver/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3a156e7cf165520d8142153d651c79dd libvncserver-0.6.ebuild 1342
-MD5 5facf4813d43c6023ac9f1ad99bd255e ChangeLog 775
-MD5 5a0f741917cbfc8c37b0deaf3be3ccb6 metadata.xml 679
-MD5 dff27ab56d81c991639f86d50377d78c files/digest-libvncserver-0.6 150
-MD5 6b08c23ec1dc7c14bf1714b076427976 files/0.5-optional-configure.ac.patch 2404
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.5 (GNU/Linux)
-
-iD8DBQFBGqENCHk4+ZoBpvsRAut6AJ9+ASUz9fUrlWLQzwzwI7xBMfcegACeO51C
-OzmGHmwbGXIxDI4jhBUC6mY=
-=ZSwd
------END PGP SIGNATURE-----
diff --git a/net-libs/libvncserver/files/0.5-optional-configure.ac.patch b/net-libs/libvncserver/files/0.5-optional-configure.ac.patch
deleted file mode 100644
index 1d14b502aea0..000000000000
--- a/net-libs/libvncserver/files/0.5-optional-configure.ac.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- configure.ac.orig	2003-02-08 23:53:42.000000000 -0500
-+++ configure.ac	2003-08-07 21:10:37.000000000 -0400
-@@ -13,11 +13,17 @@
- AH_TEMPLATE(BACKCHANNEL, [Enable BackChannel communication])
- AC_ARG_WITH(backchannel,
- 	[  --without-backchannel		disable backchannel method],
--	,AC_DEFINE(BACKCHANNEL))
-+	, [ with_backchannel=yes ])
-+if test "x$with_backchannel" = "xyes"; then
-+	AC_DEFINE(BACKCHANNEL)
-+fi
- AH_TEMPLATE(ALLOW24BPP, [Enable 24 bit per pixel in native framebuffer])
- AC_ARG_WITH(24bpp,
- 	[ --without-24bpp			disable 24 bpp framebuffers],
--	,AC_DEFINE(ALLOW24BPP))
-+	, [ with_24bpp=yes ])
-+if test "x$with_24bpp" = "xyes"; then
-+	AC_DEFINE(ALLOW24BPP)
-+fi
- 
- # Checks for X libraries
- HAVE_X="false"
-@@ -35,28 +41,36 @@
- AM_CONDITIONAL(HAVE_X, test $HAVE_X != "false")
- 
- # Checks for libraries.
--AC_CHECK_HEADERS(jpeglib.h pthread.h zlib.h)
--if test ! -z "$HAVE_JPEGLIB.H"; then
--	AC_CHECK_LIB(jpeg, jpeg_CreateCompress)
-+AC_ARG_WITH(jpeg,
-+	[ --without-jpeg			disable support for jpeg],
-+	, [ with_jpeg=yes ])
-+if test "x$with_jpeg" = "xyes"; then
-+	AC_CHECK_HEADER(jpeglib.h,
-+		[ AC_CHECK_LIB(jpeg, jpeg_CreateCompress) ])
- fi
-+AC_CHECK_HEADERS(pthread.h)
- if test ! -z "$HAVE_PTHREAD.H"; then
- 	AC_CHECK_LIB(pthread, pthread_mutex_lock)
- 	AC_CHECK_LIB(pthread, pthread_mutex_lock, HAVE_LIBPTHREAD="true")
- fi
- #AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_PTHREAD.H")
- AM_CONDITIONAL(HAVE_LIBPTHREAD, test ! -z "$HAVE_LIBPTHREAD")
--if test ! -z "$HAVE_ZLIB.H"; then
--	AC_CHECK_LIB(z, deflate)
--	# check for c++, but don't fail if not found
--	AC_CHECK_PROGS(CXX,[g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],none)
--	AH_TEMPLATE(HAVE_ZRLE, [Use zrle compression; needs a c++ compiler])
--	if test x$CXX != xnone; then
--		AC_DEFINE(HAVE_ZRLE)
--		AC_PROG_CXX
--		CCLD="\$(CXX)"
--	fi
--else
--	CXX=none
-+AC_ARG_WITH(zlib,
-+	[ --without-zlib			disable support for deflate],
-+	, [ with_zlib=yes ])
-+if test "x$with_zlib" = "xyes"; then
-+	AC_CHECK_HEADER(zlib.h,
-+		[
-+		AC_CHECK_LIB(z, deflate)
-+		# check for c++, but don't fail if not found
-+		AC_CHECK_PROGS(CXX,[g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC],none)
-+		AH_TEMPLATE(HAVE_ZRLE, [Use zrle compression; needs a c++ compiler])
-+		if test x$CXX != xnone; then
-+			AC_DEFINE(HAVE_ZRLE)
-+			AC_PROG_CXX
-+			CCLD="\$(CXX)"
-+		fi
-+		], [ CXX=none ])
- fi
- AM_CONDITIONAL(HAVE_CXX, test x$CXX != xnone)
- AC_SUBST(CCLD)
diff --git a/net-libs/libvncserver/files/digest-libvncserver-0.6 b/net-libs/libvncserver/files/digest-libvncserver-0.6
deleted file mode 100644
index 8d622812cb3f..000000000000
--- a/net-libs/libvncserver/files/digest-libvncserver-0.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b6ef0d29a1247a4dbb1b5bbc6bab6458 LibVNCServer-0.6.tar.gz 353387
-MD5 b9b1fdf4eefd9787bfe54814d74c7b62 libvncserver-0.6-20040101-x11vnc.c.bz2 25703
diff --git a/net-libs/libvncserver/files/digest-libvncserver-0.7 b/net-libs/libvncserver/files/digest-libvncserver-0.7
new file mode 100644
index 000000000000..b8061f324ce4
--- /dev/null
+++ b/net-libs/libvncserver/files/digest-libvncserver-0.7
@@ -0,0 +1 @@
+MD5 275dc50a52b4cea9cfca4a08d13032fa LibVNCServer-0.7.tar.gz 553599
diff --git a/net-libs/libvncserver/libvncserver-0.6.ebuild b/net-libs/libvncserver/libvncserver-0.7.ebuild
index 8e3b27f196cb..5d0e4b393712 100644
--- a/net-libs/libvncserver/libvncserver-0.6.ebuild
+++ b/net-libs/libvncserver/libvncserver-0.7.ebuild
@@ -1,18 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.6.ebuild,v 1.6 2004/08/11 22:42:35 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libvncserver/libvncserver-0.7.ebuild,v 1.1 2004/12/29 20:01:58 vapier Exp $
 
 inherit eutils
 
-X11VNC_VER=20040101
 DESCRIPTION="library for creating vnc servers"
 HOMEPAGE="http://libvncserver.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libvncserver/LibVNCServer-${PV}.tar.gz
-	 http://dev.gentoo.org/~plasmaroo/patches/vnc/${P}-${X11VNC_VER}-x11vnc.c.bz2"
+SRC_URI="mirror://sourceforge/libvncserver/LibVNCServer-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc hppa ~amd64"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE="nobackchannel no24bpp zlib jpeg"
 
 DEPEND="virtual/x11
@@ -24,9 +22,10 @@ S=${WORKDIR}/LibVNCServer-${PV}
 src_unpack() {
 	unpack LibVNCServer-${PV}.tar.gz
 	cd ${S}
-	sed -i "/^CFLAGS/s:-g:${CFLAGS}:" Makefile.in */Makefile.in
-	cd contrib
-	unpack ${P}-${X11VNC_VER}-x11vnc.c.bz2
+	sed -i \
+		-e "/^CFLAGS/s:-g:${CFLAGS}:" \
+		-e '/^SUBDIRS/s:x11vnc::' \
+		Makefile.in || die "sed foo"
 }
 
 src_compile() {
@@ -38,15 +37,15 @@ src_compile() {
 		&& myconf="${myconf} --without-24bpp" \
 		|| myconf="${myconf} --with-24bpp"
 	econf \
-		`use_with zlib` \
-		`use_with jpeg` \
+		$(use_with zlib) \
+		$(use_with jpeg) \
 		${myconf} \
 		|| die
 	emake || die
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make install DESTDIR="${D}" || die
 	dobin examples/storepasswd
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }