From 0779686ae9de5fe86e1d6e4bb56baa7a9e26d939 Mon Sep 17 00:00:00 2001 From: "Stephanie J. Lockwood-Childs" Date: Sat, 11 Sep 2010 22:01:10 +0000 Subject: Security update -- addresses CVE-2010-2810 (bug #335894) (Portage version: 2.1.8.3/cvs/Linux i686) --- www-client/lynx/ChangeLog | 8 +- www-client/lynx/lynx-2.8.8_pre2.ebuild | 129 --------------------------------- www-client/lynx/lynx-2.8.8_pre5.ebuild | 129 +++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 130 deletions(-) delete mode 100644 www-client/lynx/lynx-2.8.8_pre2.ebuild create mode 100644 www-client/lynx/lynx-2.8.8_pre5.ebuild (limited to 'www-client/lynx') diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog index 13052976dc36..2cfde48c1bb1 100644 --- a/www-client/lynx/ChangeLog +++ b/www-client/lynx/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-client/lynx # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.102 2010/01/12 07:12:27 wormo Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.103 2010/09/11 22:01:10 wormo Exp $ + +*lynx-2.8.8_pre5 (11 Sep 2010) + + 11 Sep 2010; Stephanie Lockwood-Childs + -lynx-2.8.8_pre2.ebuild, +lynx-2.8.8_pre5.ebuild: + Security update -- addresses CVE-2010-2810 (bug #335894) 12 Jan 2010; Stephanie Lockwood-Childs lynx-2.8.8_pre2.ebuild: diff --git a/www-client/lynx/lynx-2.8.8_pre2.ebuild b/www-client/lynx/lynx-2.8.8_pre2.ebuild deleted file mode 100644 index 2549939a5c40..000000000000 --- a/www-client/lynx/lynx-2.8.8_pre2.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre2.ebuild,v 1.2 2010/01/12 07:12:27 wormo Exp $ - -EAPI=2 - -inherit eutils versionator - -# VERSIONING SCHEME TRANSLATION -# Upstream : Gentoo -# rel. : _p -# pre. : _rc -# dev. : _pre - -if [[ "${PV/_p[0-9]}" != "${PV}" ]] -then - MY_P="${PN}${PV/_p/rel.}" - -elif [[ "${PV/_rc[0-9]}" != "${PV}" ]] -then - MY_P="${PN}${PV/_rc/pre.}" - -elif [[ "${PV/_pre[0-9]}" != "${PV}" ]] -then - MY_P="${PN}${PV/_pre/dev.}" - -fi - -DESCRIPTION="An excellent console-based web browser with ssl support" -HOMEPAGE="http://lynx.isc.org/" -SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="bzip2 cjk gnutls ipv6 nls ssl unicode" - -RDEPEND="sys-libs/ncurses[unicode?] - sys-libs/zlib - nls? ( virtual/libintl ) - ssl? ( - !gnutls? ( >=dev-libs/openssl-0.9.8 ) - gnutls? ( >=net-libs/gnutls-2.6.4 ) - ) - bzip2? ( app-arch/bzip2 )" - -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext ) - >=dev-util/pkgconfig-0.23" - -S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))" - -pkg_setup() { - if ! use ssl - then - elog "SSL support disabled; you will not be able to access secure websites." - fi -} - -src_prepare() { - # fix up toplevel makefile to enable parallel make (bug #262972) - # - # add '+' prefix to lines using $(MAKE_RECUR), - # making sure '+' comes after leading whitespace - sed -i -e '/$(MAKE_RECUR)/ s/\([[:blank:]]\)/\1+/' makefile.in || \ - die "failed to update makefile.in" - - # fix configure for openssl compiled with kerberos (bug #267749) - epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch" -} - -src_configure() { - local myargs - - if use ssl - then - # --with-gnutls and --with-ssl are alternatives, - # the latter enabling openssl support so it should be - # _not_ be used if gnutls ssl implementation is desired - if use gnutls - then - myargs="$myargs --with-gnutls" # ssl implementation = gnutls - else - myargs="$myargs --with-ssl" # ssl implementation = openssl - fi - fi - - if use unicode - then - myargs="$myargs --with-screen=ncursesw" - fi - - econf \ - --enable-nested-tables \ - --enable-cgi-links \ - --enable-persistent-cookies \ - --enable-prettysrc \ - --enable-nsl-fork \ - --enable-file-upload \ - --enable-read-eta \ - --enable-color-style \ - --enable-scrollbar \ - --enable-included-msgs \ - --with-zlib \ - $(use_enable nls) \ - $(use_enable ipv6) \ - $(use_enable cjk) \ - $(use_enable unicode japanese-utf8) \ - $(use_with bzip2 bzlib) \ - $myargs -} - -src_install() { - make install DESTDIR="${D}" || die - - sed -i -e "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \ - "${D}"/etc/lynx.cfg || die "lynx.cfg not found" - if use unicode - then - sed -i -e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ - "${D}"/etc/lynx.cfg || die "lynx.cfg not found" - fi - dodoc CHANGES COPYHEADER PROBLEMS README - docinto docs - dodoc docs/* - docinto lynx_help - dodoc lynx_help/*.txt - dohtml -r lynx_help/* -} diff --git a/www-client/lynx/lynx-2.8.8_pre5.ebuild b/www-client/lynx/lynx-2.8.8_pre5.ebuild new file mode 100644 index 000000000000..c1a8f9a0633b --- /dev/null +++ b/www-client/lynx/lynx-2.8.8_pre5.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre5.ebuild,v 1.1 2010/09/11 22:01:10 wormo Exp $ + +EAPI=2 + +inherit eutils versionator + +# VERSIONING SCHEME TRANSLATION +# Upstream : Gentoo +# rel. : _p +# pre. : _rc +# dev. : _pre + +if [[ "${PV/_p[0-9]}" != "${PV}" ]] +then + MY_P="${PN}${PV/_p/rel.}" + +elif [[ "${PV/_rc[0-9]}" != "${PV}" ]] +then + MY_P="${PN}${PV/_rc/pre.}" + +elif [[ "${PV/_pre[0-9]}" != "${PV}" ]] +then + MY_P="${PN}${PV/_pre/dev.}" + +fi + +DESCRIPTION="An excellent console-based web browser with ssl support" +HOMEPAGE="http://lynx.isc.org/" +SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="bzip2 cjk gnutls ipv6 nls ssl unicode" + +RDEPEND="sys-libs/ncurses[unicode?] + sys-libs/zlib + nls? ( virtual/libintl ) + ssl? ( + !gnutls? ( >=dev-libs/openssl-0.9.8 ) + gnutls? ( >=net-libs/gnutls-2.6.4 ) + ) + bzip2? ( app-arch/bzip2 )" + +DEPEND="${RDEPEND} + nls? ( sys-devel/gettext ) + >=dev-util/pkgconfig-0.23" + +S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))" + +pkg_setup() { + if ! use ssl + then + elog "SSL support disabled; you will not be able to access secure websites." + fi +} + +src_prepare() { + # fix up toplevel makefile to enable parallel make (bug #262972) + # + # add '+' prefix to lines using $(MAKE_RECUR), + # making sure '+' comes after leading whitespace + sed -i -e '/$(MAKE_RECUR)/ s/\([[:blank:]]\)/\1+/' makefile.in || \ + die "failed to update makefile.in" + + # fix configure for openssl compiled with kerberos (bug #267749) + epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch" +} + +src_configure() { + local myargs + + if use ssl + then + # --with-gnutls and --with-ssl are alternatives, + # the latter enabling openssl support so it should be + # _not_ be used if gnutls ssl implementation is desired + if use gnutls + then + myargs="$myargs --with-gnutls" # ssl implementation = gnutls + else + myargs="$myargs --with-ssl" # ssl implementation = openssl + fi + fi + + if use unicode + then + myargs="$myargs --with-screen=ncursesw" + fi + + econf \ + --enable-nested-tables \ + --enable-cgi-links \ + --enable-persistent-cookies \ + --enable-prettysrc \ + --enable-nsl-fork \ + --enable-file-upload \ + --enable-read-eta \ + --enable-color-style \ + --enable-scrollbar \ + --enable-included-msgs \ + --with-zlib \ + $(use_enable nls) \ + $(use_enable ipv6) \ + $(use_enable cjk) \ + $(use_enable unicode japanese-utf8) \ + $(use_with bzip2 bzlib) \ + $myargs +} + +src_install() { + make install DESTDIR="${D}" || die + + sed -i -e "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \ + "${D}"/etc/lynx.cfg || die "lynx.cfg not found" + if use unicode + then + sed -i -e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \ + "${D}"/etc/lynx.cfg || die "lynx.cfg not found" + fi + dodoc CHANGES COPYHEADER PROBLEMS README + docinto docs + dodoc docs/* + docinto lynx_help + dodoc lynx_help/*.txt + dohtml -r lynx_help/* +} -- cgit v1.2.3-65-gdbad