Revision bump to fix CVE-2005-2929 -- bug #112213. The backported patch is from Mandriva's src.rpm -- thanks to Ticho for alerting us to that available patch

(Portage version: 2.0.53_rc7)

5 files changed, 92 insertions, 3 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 7d2872676164..6ecf2f79324b 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/lynx
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.9 2005/10/17 11:59:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.10 2005/11/13 01:45:16 seemant Exp $
+
+*lynx-2.8.5-r2 (13 Nov 2005)
+
+  13 Nov 2005; Seemant Kulleen <seemant@gentoo.org> lynx-2.8.5-r1.ebuild,
+  +lynx-2.8.5-r2.ebuild:
+  Revision bump to fix CVE-2005-2929 -- bug #112213. The backported patch is
+  from Mandriva's src.rpm -- thanks to Ticho for alerting us to that available
+  patch
 
   17 Oct 2005; Seemant Kulleen <seemant@gentoo.org>
   -files/lynx2.8.4rel.1a.patch:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 0e6758dcf4cc..aa9d4b4e05f2 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,5 +1,8 @@
 MD5 5a601a177fd354a8e3dcc0a0be8c16f6 ChangeLog 6872
 MD5 a1e9c5cf250af6de957e1986fc815ac7 files/digest-lynx-2.8.5-r1 140
+MD5 3609542671c4be7e881627bc5ca33c4f files/digest-lynx-2.8.5-r2 135
+MD5 e5eb718264b1ac0711e60aaf59215b20 files/lynx-2.8.5-CVE-2005-2929.patch 3299
 MD5 62a95dce16ec74f3ecb3bc3df818fbbc files/lynx-2.8.5-darwin.patch 652
 MD5 86f376657682fe47a4e2433654488668 lynx-2.8.5-r1.ebuild 1910
+MD5 eb98321d4285cf0e7c1b6cac6f08eb59 lynx-2.8.5-r2.ebuild 1949
 MD5 acaa86fdf4e340e1180ce324110007cd metadata.xml 224
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r2 b/www-client/lynx/files/digest-lynx-2.8.5-r2
new file mode 100644
index 000000000000..bbf03cf88679
--- /dev/null
+++ b/www-client/lynx/files/digest-lynx-2.8.5-r2
@@ -0,0 +1,2 @@
+MD5 0dbf511e3680e8c7c179d21db27c8fba lynx-2.8.5-gentoo-0.1.tar.bz2 5017
+MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
diff --git a/www-client/lynx/lynx-2.8.5-r1.ebuild b/www-client/lynx/lynx-2.8.5-r1.ebuild
index 6cb52df37204..66268be3b04a 100644
--- a/www-client/lynx/lynx-2.8.5-r1.ebuild
+++ b/www-client/lynx/lynx-2.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r1.ebuild,v 1.1 2005/10/17 11:58:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r1.ebuild,v 1.2 2005/11/13 01:45:16 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,6 @@ MY_P=${P/-/}
 DESCRIPTION="An excellent console-based web browser with ssl support"
 HOMEPAGE="http://lynx.browser.org/"
 SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~seemant/distfiles/${P}-CAN-${SEC_V}.patch.bz2
 	mirror://gentoo/${P}-CAN-${SEC_V}.patch.bz2"
 
 LICENSE="GPL-2"
diff --git a/www-client/lynx/lynx-2.8.5-r2.ebuild b/www-client/lynx/lynx-2.8.5-r2.ebuild
new file mode 100644
index 000000000000..4ab834a14808
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.5-r2.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/www-client/lynx/lynx-2.8.5-r2.ebuild,v 1.1 2005/11/13 01:45:16 seemant Exp $
+
+inherit eutils flag-o-matic
+
+PATCHVER=0.1
+
+MY_P=${P/-/}
+DESCRIPTION="An excellent console-based web browser with ssl support"
+HOMEPAGE="http://lynx.browser.org/"
+SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
+IUSE="ssl nls ipv6"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/zlib
+	nls? ( sys-devel/gettext )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+PROVIDE="virtual/textbrowser"
+
+S=${WORKDIR}/${PN}${PV//./-}
+PATCHDIR=${WORKDIR}/gentoo/patches
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
+}
+
+src_compile() {
+	local myconf
+	use ssl && myconf="${myconf} --with-ssl=yes"
+
+	append-flags -DANSI_VARARGS
+
+	econf \
+		--libdir=/etc/lynx \
+		--enable-cgi-links \
+		--enable-EXP_PERSISTENT_COOKIES \
+		--enable-prettysrc \
+		--enable-nsl-fork \
+		--enable-file-upload \
+		--enable-read-eta \
+		--enable-libjs \
+		--enable-color-style \
+		--enable-scrollbar \
+		--enable-included-msgs \
+		--with-zlib \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		${myconf} || die
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	einstall libdir=${D}/etc/lynx || die
+
+	dosed "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help/lynx_help_main.html|" \
+			/etc/lynx/lynx.cfg
+	dodoc CHANGES COPYHEADER INSTALLATION PROBLEMS README
+	docinto docs
+	dodoc docs/*
+	docinto lynx_help
+	dodoc lynx_help/*.txt
+	dohtml -r lynx_help
+
+	# small little manpage glitch
+	rm ${D}/usr/share/man/lynx.1
+	newman lynx.man lynx.1
+}