security fix, bug 159145.

(Portage version: 2.1.1-r2)

4 files changed, 158 insertions, 1 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index ed5e10fb86a1..45772e62c02d 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.22 2006/09/13 17:54:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.23 2006/12/27 16:11:08 matsuu Exp $
+
+*w3m-0.5.1-r4 (27 Dec 2006)
+
+  27 Dec 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/w3m-0.5.1-security.patch, +w3m-0.5.1-r4.ebuild:
+  Security fix, bug 159145.
 
   05 Aug 2006; MATSUU Takuto <matsuu@gentoo.org>
   -files/w3m-0.4.2-imglib-gentoo.diff, -w3m-0.4.2.ebuild,
diff --git a/www-client/w3m/files/digest-w3m-0.5.1-r4 b/www-client/w3m/files/digest-w3m-0.5.1-r4
new file mode 100644
index 000000000000..507d075c45d6
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.5.1-r4
@@ -0,0 +1,9 @@
+MD5 291a22d15e5c465615b31ba41a4198f7 w3m-0.5.1-cvs1.938.diff.gz 20040
+RMD160 b18bbb4be4e110619ceb853d9c18441366ee1c77 w3m-0.5.1-cvs1.938.diff.gz 20040
+SHA256 907de5b4cb63955d589c4107907be579d756e694f84cd800db31d62ec5e1f858 w3m-0.5.1-cvs1.938.diff.gz 20040
+MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
+RMD160 a5ffd3a8d44ed55109a1ab4a34d51ae236902654 w3m-0.5.1.tar.gz 1892121
+SHA256 e40c7e3a2c2d5fdc7d92369e77d69256f061493f38c91d699e4436e949802c1d w3m-0.5.1.tar.gz 1892121
+MD5 7abde0e5f0dc04352ebf3969a4a2c75c w3m-cvs-1.942-async-7.diff.gz 79535
+RMD160 338d171ba4807bb372ee00baa96954022fcd8d4c w3m-cvs-1.942-async-7.diff.gz 79535
+SHA256 bea07e4da91154567b5ed0da018a02e3e4debad5c119e82fed5f0c476b8d926a w3m-cvs-1.942-async-7.diff.gz 79535
diff --git a/www-client/w3m/files/w3m-0.5.1-security.patch b/www-client/w3m/files/w3m-0.5.1-security.patch
new file mode 100644
index 000000000000..2a05dd086c04
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.1-security.patch
@@ -0,0 +1,12 @@
+diff -Naur w3m-0.5.1.orig/file.c w3m-0.5.1/file.c
+--- w3m-0.5.1.orig/file.c	2004-04-17 03:47:19.000000000 +0900
++++ w3m-0.5.1/file.c	2006-12-28 00:40:00.000000000 +0900
+@@ -7799,7 +7799,7 @@
+ 	ans = inputChar(prompt);
+     }
+     else {
+-	printf(prompt);
++	printf("%s", prompt);
+ 	fflush(stdout);
+ 	ans = Strfgets(stdin)->ptr;
+     }
diff --git a/www-client/w3m/w3m-0.5.1-r4.ebuild b/www-client/w3m/w3m-0.5.1-r4.ebuild
new file mode 100644
index 000000000000..f52640cb8f4d
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.1-r4.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r4.ebuild,v 1.1 2006/12/27 16:11:08 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/
+	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
+PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
+	async? ( ${PATCH_PATH}/w3m-cvs-1.942-async-7.diff.gz )
+	http://dev.gentoo.org/~usata/distfiles/${P}-cvs1.938.diff.gz"
+# w3m color patch:
+#	http://homepage3.nifty.com/slokar/w3m/${P}_256-005.patch.gz
+# w3n canna inline patch:
+#	canna? ( http://www.j10n.org/files/w3m-cvs-1.914-canna.patch )
+# w3m bookmark charset patch:
+#	nls? ( ${PATCH_PATH}/w3m-cvs-1.942-nls-2.diff.gz )
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="X async fbcon gpm gtk imlib lynxkeymap migemo nls ssl unicode xface"
+#IUSE="canna"
+
+# canna? ( app-i18n/canna )
+# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
+# allow us to build w/o X, so we have to give up framebuffer w3mimg....
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( || ( x11-libs/libX11 virtual/x11 ) )
+	gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0 ) )
+	xface? ( media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	migemo? ( >=app-text/migemo-0.40 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+PROVIDE="virtual/w3m"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${P}-cvs1.938.diff.gz
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+	epatch ${FILESDIR}/${P}-security.patch
+
+	use async && epatch ${DISTDIR}/w3m-cvs-1.942-async-7.diff.gz
+
+	#epatch ${DISTDIR}/${P}_256-005.patch.gz
+	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
+}
+
+src_compile() {
+
+	local myconf migemo_command imagelibval imageval
+
+	if use gtk ; then
+		imagelibval="gtk2"
+	elif use imlib ; then
+		imagelibval="imlib2"
+	fi
+
+	if [ ! -z "${imagelibval}" ] ; then
+		use X && imageval="${imageval}${imageval:+,}x11"
+		use X && use fbcon && imageval="${imageval}${imageval:+,}fb"
+	fi
+
+	if use migemo ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use linguas_ja ; then
+		myconf="${myconf} --enable-japanese=E"
+	else
+		myconf="${myconf} --with-charset=US-ASCII"
+	fi
+	if use unicode ; then
+		myconf="${myconf} --with-charset=UTF-8"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	econf \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--enable-image=${imageval:-no} \
+		--with-imagelib="${imagelibval:-no}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		--enable-unicode \
+		$(use_enable gpm mouse) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable nls) \
+		$(use_enable xface) \
+		${myconf} || die
+		# $(use_with canna)
+
+	# emake borked
+	emake -j1 all || die "make failed"
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die "make install failed"
+
+	insinto /usr/share/${PN}/Bonus
+	doins Bonus/*
+	dodoc README NEWS TODO ChangeLog
+	docinto doc-en ; dodoc doc/*
+	if use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}