Security fix for CAN-2005-3120, see bug #108451

Package-Manager: portage-2.0.53_rc5

5 files changed, 25 insertions, 15 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 816b61091653..6688dcd662b5 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2005/10/12 12:25:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.8 2005/10/17 11:58:37 seemant Exp $
+
+*lynx-2.8.5-r1 (17 Oct 2005)
+
+  17 Oct 2005; Seemant Kulleen <seemant@gentoo.org> -lynx-2.8.5.ebuild,
+  +lynx-2.8.5-r1.ebuild:
+  Security fix for CAN-2005-3120, see bug #108451
 
   12 Oct 2005; Seemant Kulleen <seemant@gentoo.org>
   -files/lynx-2.8.4.1c-gentoo.patch, -files/lynx-2.8.4.1d-gentoo.patch,
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index f28d34e3eb86..690ccfcd4e6c 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,6 +1,6 @@
-MD5 8b4f1fe29bb369ca8364faec8c402814 ChangeLog 6593
-MD5 d256ae9121ae1557872c376683b93cc8 files/digest-lynx-2.8.5 63
+MD5 5a6491c8c51488abc0918fb5b0c6f572 ChangeLog 6771
+MD5 a1e9c5cf250af6de957e1986fc815ac7 files/digest-lynx-2.8.5-r1 140
 MD5 62a95dce16ec74f3ecb3bc3df818fbbc files/lynx-2.8.5-darwin.patch 652
 MD5 b0b269efc9ff697e40a10f99919599ea files/lynx2.8.4rel.1a.patch 7515
-MD5 5141fc813d16fd6e01e2e3154ea66fcb lynx-2.8.5.ebuild 1878
+MD5 86f376657682fe47a4e2433654488668 lynx-2.8.5-r1.ebuild 1910
 MD5 acaa86fdf4e340e1180ce324110007cd metadata.xml 224
diff --git a/www-client/lynx/files/digest-lynx-2.8.5 b/www-client/lynx/files/digest-lynx-2.8.5
deleted file mode 100644
index 5508fae56078..000000000000
--- a/www-client/lynx/files/digest-lynx-2.8.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r1 b/www-client/lynx/files/digest-lynx-2.8.5-r1
new file mode 100644
index 000000000000..2db84096d545
--- /dev/null
+++ b/www-client/lynx/files/digest-lynx-2.8.5-r1
@@ -0,0 +1,2 @@
+MD5 ee3fd13a06677b24ee3bc3dbc1fd4795 lynx-2.8.5-CAN-2005-3120.patch.bz2 3584
+MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
diff --git a/www-client/lynx/lynx-2.8.5.ebuild b/www-client/lynx/lynx-2.8.5-r1.ebuild
index 09c8c13f2c8e..6cb52df37204 100644
--- a/www-client/lynx/lynx-2.8.5.ebuild
+++ b/www-client/lynx/lynx-2.8.5-r1.ebuild
@@ -1,22 +1,25 @@
 # 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.ebuild,v 1.5 2005/10/12 12:25:01 seemant Exp $
+# $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 $
 
 inherit eutils flag-o-matic
 
-#MY_PV=${PV/.1d/rel.1}
+SEC_V=2005-3120
+
 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"
+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"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos s390 sparc x86"
 IUSE="ssl nls ipv6"
 
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3
+DEPEND="sys-libs/ncurses
+	sys-libs/zlib
 	nls? ( sys-devel/gettext )
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 PROVIDE="virtual/textbrowser"
@@ -24,15 +27,14 @@ PROVIDE="virtual/textbrowser"
 S=${WORKDIR}/${PN}${PV//./-}
 
 src_unpack() {
-	unpack ${A}
+	unpack ${A}; cd ${S}
+	epatch ${WORKDIR}/${P}-CAN-${SEC_V}.patch
 	use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
 }
 
 src_compile() {
 	local myconf
-	use nls && myconf="${myconf} --enable-nls"
 	use ssl && myconf="${myconf} --with-ssl=yes"
-	use ipv6 && myconf="${myconf} --enable-ipv6"
 
 	append-flags -DANSI_VARARGS
 
@@ -49,14 +51,15 @@ src_compile() {
 		--enable-scrollbar \
 		--enable-included-msgs \
 		--with-zlib \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
 		${myconf} || die
 
 	emake || die "compile problem"
 }
 
 src_install() {
-	make prefix=${D}/usr datadir=${D}/usr/share mandir=${D}/usr/share/man \
-		libdir=${D}/etc/lynx install || die
+	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