diff options
author | Matsuu Takuto <matsuu@gentoo.org> | 2006-12-27 16:11:08 +0000 |
---|---|---|
committer | Matsuu Takuto <matsuu@gentoo.org> | 2006-12-27 16:11:08 +0000 |
commit | 716c48248d4d2d3a1f38b7ddfeacde2127d9e7dd (patch) | |
tree | 82ba3a90f5ea27473500df65baaabadd4ec6959c /www-client | |
parent | ppc stable (bug #152115) (diff) | |
download | historical-716c48248d4d2d3a1f38b7ddfeacde2127d9e7dd.tar.gz historical-716c48248d4d2d3a1f38b7ddfeacde2127d9e7dd.tar.bz2 historical-716c48248d4d2d3a1f38b7ddfeacde2127d9e7dd.zip |
security fix, bug 159145.
Package-Manager: portage-2.1.1-r2
Diffstat (limited to 'www-client')
-rw-r--r-- | www-client/w3m/ChangeLog | 8 | ||||
-rw-r--r-- | www-client/w3m/Manifest | 29 | ||||
-rw-r--r-- | www-client/w3m/files/digest-w3m-0.5.1-r4 | 9 | ||||
-rw-r--r-- | www-client/w3m/files/w3m-0.5.1-security.patch | 12 | ||||
-rw-r--r-- | www-client/w3m/w3m-0.5.1-r4.ebuild | 130 |
5 files changed, 173 insertions, 15 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/Manifest b/www-client/w3m/Manifest index adb23c874ca2..512c4811f437 100644 --- a/www-client/w3m/Manifest +++ b/www-client/w3m/Manifest @@ -1,6 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +AUX w3m-0.5.1-security.patch 334 RMD160 18f9c9eae5e830588f9cec35c0aae62df7bd3ac1 SHA1 02eddf2782e7af6888c77d8ca57dff26823768e8 SHA256 dfd2417e0bb9ec82054a1a71cbc1fd4f3a84eeb090e751344ef9fc6bfe6e1046 +MD5 7c50770e2ed9e3a4a39b34b4f2888225 files/w3m-0.5.1-security.patch 334 +RMD160 18f9c9eae5e830588f9cec35c0aae62df7bd3ac1 files/w3m-0.5.1-security.patch 334 +SHA256 dfd2417e0bb9ec82054a1a71cbc1fd4f3a84eeb090e751344ef9fc6bfe6e1046 files/w3m-0.5.1-security.patch 334 AUX w3m-w3mman-gentoo.diff 1059 RMD160 4045c2a7b2c1579274d86c7942c0d61aa7e9cc85 SHA1 985812c2ec6cad9d1e88bcd1538ef7aa93dc60b0 SHA256 dc4932c59f78d7dd5d5076acc2825aafd73a2ce7c4993216f125472aedb400b6 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059 RMD160 4045c2a7b2c1579274d86c7942c0d61aa7e9cc85 files/w3m-w3mman-gentoo.diff 1059 @@ -12,10 +13,14 @@ EBUILD w3m-0.5.1-r3.ebuild 3606 RMD160 110c3f70c1d6dc7bb4542254e0d30c74a5473137 MD5 bd389b766b378a8d244e1d1ec82b2558 w3m-0.5.1-r3.ebuild 3606 RMD160 110c3f70c1d6dc7bb4542254e0d30c74a5473137 w3m-0.5.1-r3.ebuild 3606 SHA256 1f9237a699faf25a4a4caf62c6fb76e6a867561782a20b97c45f79950c91cd5c w3m-0.5.1-r3.ebuild 3606 -MISC ChangeLog 14120 RMD160 c8b38f69e857502efe3d73892ce53fbbd65cc22d SHA1 dd918f19bc7d87ed0b8176cd67ced67d48be0497 SHA256 f2eeef55a994092ac59dfbe5c8ff34ccba3871af8483b00b30c62bf897cbe5b0 -MD5 607f3a6ffab62ed01250ba8d3f3a8461 ChangeLog 14120 -RMD160 c8b38f69e857502efe3d73892ce53fbbd65cc22d ChangeLog 14120 -SHA256 f2eeef55a994092ac59dfbe5c8ff34ccba3871af8483b00b30c62bf897cbe5b0 ChangeLog 14120 +EBUILD w3m-0.5.1-r4.ebuild 3649 RMD160 131205d484dd1a16878c051ca30201995a28a195 SHA1 68300f3be2a0a69c307f12156d808db39d0b7d0d SHA256 964c9b2a52781731b14012ce4d19fb50b917683da807c981373c8c80fee797b3 +MD5 ea92560be2aca8fabbdebe6641ceeb0f w3m-0.5.1-r4.ebuild 3649 +RMD160 131205d484dd1a16878c051ca30201995a28a195 w3m-0.5.1-r4.ebuild 3649 +SHA256 964c9b2a52781731b14012ce4d19fb50b917683da807c981373c8c80fee797b3 w3m-0.5.1-r4.ebuild 3649 +MISC ChangeLog 14286 RMD160 742fb8d2ed9e492792343c3b9a797820f7656322 SHA1 6f26be3d9d991b6009cad7ef0694ce8d903113f9 SHA256 78e7449ea65e0eccaf405dcdabc693ff884ca26b351e24f754948ed32f9e79c8 +MD5 4ade1ccd42b7bd4b8c51e0f46669c332 ChangeLog 14286 +RMD160 742fb8d2ed9e492792343c3b9a797820f7656322 ChangeLog 14286 +SHA256 78e7449ea65e0eccaf405dcdabc693ff884ca26b351e24f754948ed32f9e79c8 ChangeLog 14286 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156 @@ -23,10 +28,6 @@ SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata MD5 5b71e58bff2c3a0ad95e5842c06fa2cd files/digest-w3m-0.5.1-r3 753 RMD160 18e75de261413e091fa3043b1be6d0333de6d8b7 files/digest-w3m-0.5.1-r3 753 SHA256 f17c3dfb7f827dda6d3673956f31fda1b831a4b5bc0a4970ea97acf3fe4dbf8d files/digest-w3m-0.5.1-r3 753 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFCEXwV3J2n04EauwRAgzcAKC2DeEocnPrR7Cy1h+zWNnIhJDNcQCgzR88 -JkOsrGo77ne3Ovp3WEJWJ4s= -=ur3G ------END PGP SIGNATURE----- +MD5 5b71e58bff2c3a0ad95e5842c06fa2cd files/digest-w3m-0.5.1-r4 753 +RMD160 18e75de261413e091fa3043b1be6d0333de6d8b7 files/digest-w3m-0.5.1-r4 753 +SHA256 f17c3dfb7f827dda6d3673956f31fda1b831a4b5bc0a4970ea97acf3fe4dbf8d files/digest-w3m-0.5.1-r4 753 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 +} |