Add patch to fix bug #145739.

Package-Manager: portage-2.1.1_rc1-r2

5 files changed, 156 insertions, 5 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index ff3ad91b0990..d3f0b7b093e7 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/lynx
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.36 2006/08/10 08:31:54 exg Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.37 2006/08/31 21:20:03 exg Exp $
+
+*lynx-2.8.5-r4 (31 Aug 2006)
+
+  31 Aug 2006; Emanuele Giaquinta <exg@gentoo.org>
+  +files/lynx-2.8.5-embedded-url.patch, +lynx-2.8.5-r4.ebuild:
+  Add patch to fix bug #145739.
 
   10 Aug 2006; Emanuele Giaquinta <exg@gentoo.org> lynx-2.8.5-r3.ebuild,
   lynx-2.8.6_pre18.ebuild:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index fc1a2d14b6a6..540d3bc2a665 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -2,6 +2,10 @@ AUX lynx-2.8.5-darwin.patch 687 RMD160 24a53a2c71595b92e16286585994d1dd262d6904
 MD5 a041d139e8868dac8d23fd879f31809a files/lynx-2.8.5-darwin.patch 687
 RMD160 24a53a2c71595b92e16286585994d1dd262d6904 files/lynx-2.8.5-darwin.patch 687
 SHA256 6b22b9cdecb584102a16d92a3884ddc296daece98b38a0f42f75d7a2d618763a files/lynx-2.8.5-darwin.patch 687
+AUX lynx-2.8.5-embedded-url.patch 1619 RMD160 ba18cb0d146e05a91a7364527097782e22ceec4c SHA1 c434e50f01c2d286652de8111871f390e93f3771 SHA256 8fb75cfa5c3fc0d370df6127cad07dfb38fdca3eb262f3c3dc26b3fd8f785e9f
+MD5 64428436d4baefac22ea5c75d6d50582 files/lynx-2.8.5-embedded-url.patch 1619
+RMD160 ba18cb0d146e05a91a7364527097782e22ceec4c files/lynx-2.8.5-embedded-url.patch 1619
+SHA256 8fb75cfa5c3fc0d370df6127cad07dfb38fdca3eb262f3c3dc26b3fd8f785e9f files/lynx-2.8.5-embedded-url.patch 1619
 AUX lynx-2.8.5-tab_to.patch 433 RMD160 3374d9ff8488275b077ccb9287f23e678602b59c SHA1 af3ec1090f309ac86c1ff170e26055a7255ec778 SHA256 33f4a6a3293c095e825faf50e525c415c63d9a6b7622aa2a1207adcc56e18b3c
 MD5 0cbf6e7f62c43375c180ab6c3042bb8c files/lynx-2.8.5-tab_to.patch 433
 RMD160 3374d9ff8488275b077ccb9287f23e678602b59c files/lynx-2.8.5-tab_to.patch 433
@@ -18,14 +22,18 @@ EBUILD lynx-2.8.5-r3.ebuild 1933 RMD160 1bb6c5fada2d99843ac06feffd90e97bae597b0a
 MD5 356f3743f8954491fcebe60d34365793 lynx-2.8.5-r3.ebuild 1933
 RMD160 1bb6c5fada2d99843ac06feffd90e97bae597b0a lynx-2.8.5-r3.ebuild 1933
 SHA256 708eb39d924c1d7988af86cba950c6b33e98de84c07557df21110d63d1b03e70 lynx-2.8.5-r3.ebuild 1933
+EBUILD lynx-2.8.5-r4.ebuild 1985 RMD160 49e07e02b7e5488714393a3bcf3f31cb2b7d4ee6 SHA1 b2e575aa0afe4cf589bf250fa59ab1c7feb67472 SHA256 b46d0941020dc62a58d0db6243d383a45a86be002811a8f8691a6cfd1f276648
+MD5 a5e0123ed9c545d9e807a9774490b38f lynx-2.8.5-r4.ebuild 1985
+RMD160 49e07e02b7e5488714393a3bcf3f31cb2b7d4ee6 lynx-2.8.5-r4.ebuild 1985
+SHA256 b46d0941020dc62a58d0db6243d383a45a86be002811a8f8691a6cfd1f276648 lynx-2.8.5-r4.ebuild 1985
 EBUILD lynx-2.8.6_pre18.ebuild 2116 RMD160 a0254050966ace26b3267e0d516422abe930d0e0 SHA1 8e010b1eef7d34120fb6b895dab6efbbc5d542f2 SHA256 dda7afe7b6817d5643e4e0d32ce8986b91478243693dd82b9c20d1f11f1cb577
 MD5 00816d9a5d0a22bdb64838dca8fc1cbc lynx-2.8.6_pre18.ebuild 2116
 RMD160 a0254050966ace26b3267e0d516422abe930d0e0 lynx-2.8.6_pre18.ebuild 2116
 SHA256 dda7afe7b6817d5643e4e0d32ce8986b91478243693dd82b9c20d1f11f1cb577 lynx-2.8.6_pre18.ebuild 2116
-MISC ChangeLog 10228 RMD160 2b52188b1a7f3213af28681411a93edfa142a8a2 SHA1 aeed9cfa860a647f50f47e0fa2418d5bf530361f SHA256 f2c200652d086633d0937b895b2ac736b2a476049cbca9f9ee58632363f3b5e1
-MD5 a6f1292908210749b39a391f51836742 ChangeLog 10228
-RMD160 2b52188b1a7f3213af28681411a93edfa142a8a2 ChangeLog 10228
-SHA256 f2c200652d086633d0937b895b2ac736b2a476049cbca9f9ee58632363f3b5e1 ChangeLog 10228
+MISC ChangeLog 10405 RMD160 ef7f37208ea33188788c71578d55aef6f4a6557d SHA1 e03a7defab5dd31aff2d2d63fb0b037b15fd474e SHA256 178f5b269757e821aa980b5a2dbce48b8532fac94b4dae7934eceaf540b7164d
+MD5 be94b66ff7b1c9ab2a6cb0b0a084d24f ChangeLog 10405
+RMD160 ef7f37208ea33188788c71578d55aef6f4a6557d ChangeLog 10405
+SHA256 178f5b269757e821aa980b5a2dbce48b8532fac94b4dae7934eceaf540b7164d ChangeLog 10405
 MISC metadata.xml 219 RMD160 f4e5c27d20fdfedce65aa30b99b37def5d23e8c8 SHA1 8f4c97f3b80298da3db4c865706476f658495e4a SHA256 b99bdb99f36f88c79e300c9fbe9ae405908400d462788a6ac661173d904c8167
 MD5 0105a0859a9fe9050dd3de1aad0f05b5 metadata.xml 219
 RMD160 f4e5c27d20fdfedce65aa30b99b37def5d23e8c8 metadata.xml 219
@@ -36,6 +44,9 @@ SHA256 192b0883fb9088aa1ac4d57ba1e6bbf97eb170854c84a62f274dc4418349e83c files/di
 MD5 7887b8d7d6c91fd477215c7b588e3951 files/digest-lynx-2.8.5-r3 485
 RMD160 a490d53a822fb24770185a489de04d7c95dc535f files/digest-lynx-2.8.5-r3 485
 SHA256 db5e05540a0aafd5f58d09a9501678f96bb2206c327af0676d89e253ee7b305f files/digest-lynx-2.8.5-r3 485
+MD5 7887b8d7d6c91fd477215c7b588e3951 files/digest-lynx-2.8.5-r4 485
+RMD160 a490d53a822fb24770185a489de04d7c95dc535f files/digest-lynx-2.8.5-r4 485
+SHA256 db5e05540a0aafd5f58d09a9501678f96bb2206c327af0676d89e253ee7b305f files/digest-lynx-2.8.5-r4 485
 MD5 37f851416db43046e4b698b4d75946fc files/digest-lynx-2.8.6_pre18 253
 RMD160 105ba500af7d3a5097a516095d7d817730ce424c files/digest-lynx-2.8.6_pre18 253
 SHA256 b9dc6cf81a015a29cd6406f1c9ffc67776dee241fbd85cecf0cb862cf5e9cd1a files/digest-lynx-2.8.6_pre18 253
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r4 b/www-client/lynx/files/digest-lynx-2.8.5-r4
new file mode 100644
index 000000000000..f7f732972368
--- /dev/null
+++ b/www-client/lynx/files/digest-lynx-2.8.5-r4
@@ -0,0 +1,6 @@
+MD5 070b1da6098ca1bb8b084713766dfb3a lynx-2.8.5-rel5.patch.bz2 6907
+RMD160 9e843f4c235c1de17a4ebe62ad1511dd9ed1f620 lynx-2.8.5-rel5.patch.bz2 6907
+SHA256 a6997212e7a36c109f57856d1ce185c074b598f2fb1b1d3d9c57fe38df5d6ccb lynx-2.8.5-rel5.patch.bz2 6907
+MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
+RMD160 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 lynx2.8.5.tar.bz2 2177287
+SHA256 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63 lynx2.8.5.tar.bz2 2177287
diff --git a/www-client/lynx/files/lynx-2.8.5-embedded-url.patch b/www-client/lynx/files/lynx-2.8.5-embedded-url.patch
new file mode 100644
index 000000000000..8bf23803997b
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.5-embedded-url.patch
@@ -0,0 +1,51 @@
+--- WWW/Library/Implementation/HTParse.c.old	2006-08-31 22:55:10.031020854 +0200
++++ WWW/Library/Implementation/HTParse.c	2006-08-31 22:56:58.964604699 +0200
+@@ -166,6 +166,16 @@
+ #define LYalloca_free(x)   free(x)
+ #endif
+ 
++static char *strchr_or_end(char *string, int ch)
++{
++    char *result = strchr(string, ch);
++
++    if (result == 0) {
++	result = string + strlen(string);
++    }
++    return result;
++}
++
+ /*	Parse a Name relative to another name.			HTParse()
+ **	--------------------------------------
+ **
+@@ -455,13 +465,24 @@
+ 	    *tail++ = '/';
+ 	    strcpy(tail, related.absolute);
+ 	    if (given.relative) {
+-		p = strchr(tail, '?');	/* Search part? */
+-		if (p == NULL)
+-		    p = (tail + strlen(tail) - 1);
+-		for (; *p != '/'; p--)
+-		    ;				/* last / */
+-		p[1] = '\0';			/* Remove filename */
+-		strcat(p, given.relative); /* Add given one */
++		/* RFC 1808 part 4 step 5 (if URL path is empty) */
++		/* a) if given has params, add/replace that */
++		if (given.relative[0] == ';') {
++		    strcpy(strchr_or_end(tail, ';'), given.relative);
++		}
++		/* b) if given has query, add/replace that */
++		else if (given.relative[0] == '?') {
++		    strcpy(strchr_or_end(tail, '?'), given.relative);
++		}
++		/* otherwise fall through to RFC 1808 part 4 step 6 */
++		else {
++		    p = strchr(tail, '?');	/* Search part? */
++		    if (p == NULL)
++			p = (tail + strlen(tail) - 1);
++		    for (; *p != '/'; p--) ;	/* last / */
++		    p[1] = '\0';	/* Remove filename */
++		    strcat(p, given.relative);	/* Add given one */
++		}
+ 		HTSimplify (result);
+ 	    }
+ 	    CTRACE((tfp, "HTParse: (Related-ABS)\n"));
diff --git a/www-client/lynx/lynx-2.8.5-r4.ebuild b/www-client/lynx/lynx-2.8.5-r4.ebuild
new file mode 100644
index 000000000000..8c93d6cfadc3
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.5-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 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-r4.ebuild,v 1.1 2006/08/31 21:20:03 exg Exp $
+
+inherit eutils flag-o-matic
+
+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
+	mirror://gentoo/${P}-rel5.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 cjk ipv6 nls ssl"
+
+DEPEND="sys-libs/ncurses
+	sys-libs/zlib
+	nls? ( sys-devel/gettext )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	bzip2? ( app-arch/bzip2 )"
+
+S="${WORKDIR}/${PN}${PV//./-}"
+
+src_unpack() {
+	unpack ${A}; cd "${S}"
+	epatch "${DISTDIR}/${P}"-rel5.patch.bz2
+	epatch "${FILESDIR}/${P}"-darwin.patch
+	epatch "${FILESDIR}/${P}"-tab_to.patch
+	epatch "${FILESDIR}/${P}"-embedded-url.patch
+}
+
+src_compile() {
+	local myconf
+	use ssl && myconf="${myconf} --with-ssl=yes"
+	use bzip2 && myconf="${myconf} --with-bzlib"
+
+	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) \
+		$(use_enable cjk) \
+		${myconf} || die
+
+	emake -j1 || 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
+}