bug 92693 and bug 92660

(Portage version: 2.0.51.19)

5 files changed, 181 insertions, 4 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index f59be78f74b5..a62080622ca3 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/links
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.17 2005/05/25 08:11:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.18 2005/06/07 21:13:09 vanquirius Exp $
+
+*links-2.1_pre17-r2 (07 Jun 2005)
+
+  07 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/links-2.1_pre17-auth.patch, +links-2.1_pre17-r2.ebuild:
+  Two things. Cross-compilation fix for bug 92693, thanks to Radek Podgorny
+  <radek@podgorny.cz> for reporting. Authentication patch for bug 92660
+  upstream would like to have tested. In package.mask for testing.
 
   25 May 2005; Markus Rothe <corsair@gentoo.org> links-2.1_pre17.ebuild:
   Stable on ppc64
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index feb11939e246..0f70512c045a 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,8 +1,11 @@
-MD5 c26ce379a12ab760654314b9f1287f6a ChangeLog 13101
+MD5 062c4a8def1ac62caa5437c415ed8f3b links-2.1_pre17-r2.ebuild 3678
 MD5 23210c68197b9588f90f4f89cefa2ded links-2.1_pre15.ebuild 3164
-MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
 MD5 f52d75ed8376debd8780fa0a4d56ecf0 links-2.1_pre17.ebuild 3179
 MD5 2029a7cd3aeacd648000e8bfaf77c536 links-2.1_pre17-r1.ebuild 3518
-MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
+MD5 c26ce379a12ab760654314b9f1287f6a ChangeLog 13101
+MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
+MD5 c2ff68f6718818b0e7da326d91d25a5e files/links-2.1_pre17-auth.patch 1026
 MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r1 139
+MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r2 139
+MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
 MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17 139
diff --git a/www-client/links/files/digest-links-2.1_pre17-r2 b/www-client/links/files/digest-links-2.1_pre17-r2
new file mode 100644
index 000000000000..7ed0613440cb
--- /dev/null
+++ b/www-client/links/files/digest-links-2.1_pre17-r2
@@ -0,0 +1,2 @@
+MD5 94315d9ba68bbb543d93b3b3b4f07582 links-2.1pre17.tar.bz2 3829168
+MD5 5f8700ad2fc388bc3bd7d7a73bb0e987 links-2.1pre17-utf8.diff.bz2 4151
diff --git a/www-client/links/files/links-2.1_pre17-auth.patch b/www-client/links/files/links-2.1_pre17-auth.patch
new file mode 100644
index 000000000000..057aaa491357
--- /dev/null
+++ b/www-client/links/files/links-2.1_pre17-auth.patch
@@ -0,0 +1,22 @@
+diff --exclude='*~' -Naur links-2.1pre17.utf8/auth.c links-2.1pre17.utf8.auth/auth.c
+--- links-2.1pre17.utf8/auth.c	2005-06-07 17:54:34.000000000 -0300
++++ links-2.1pre17.utf8.auth/auth.c	2005-06-07 17:55:31.000000000 -0300
+@@ -62,6 +62,7 @@
+ 		h = get_host_name(url);
+ 		if (h) return h;
+ 		return stracpy("");
++	if (casecmp(h, "Basic", 5)) return NULL;
+ 	}
+ 	q = strchr(h, '"');
+ 	if (!q) {
+diff --exclude='*~' -Naur links-2.1pre17.utf8/objreq.c links-2.1pre17.utf8.auth/objreq.c
+--- links-2.1pre17.utf8/objreq.c	2005-06-07 17:54:34.000000000 -0300
++++ links-2.1pre17.utf8.auth/objreq.c	2005-06-07 17:56:12.000000000 -0300
+@@ -234,6 +234,7 @@
+ 		}
+ 		if (stat->ce && rq->state == O_WAITING && (stat->ce->http_code == 401 || stat->ce->http_code == 407)) {
+ 			unsigned char *realm = get_auth_realm(rq->url, stat->ce->head, stat->ce->http_code == 407);
++			if (!realm) goto xx;
+ 			if (stat->ce->http_code == 401 && !find_auth(rq->url, realm)) {
+ 				mem_free(realm);
+ 				if (rq->redirect_cnt++ >= MAX_REDIRECTS) goto maxrd;
diff --git a/www-client/links/links-2.1_pre17-r2.ebuild b/www-client/links/links-2.1_pre17-r2.ebuild
new file mode 100644
index 000000000000..6198c8303552
--- /dev/null
+++ b/www-client/links/links-2.1_pre17-r2.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre17-r2.ebuild,v 1.1 2005/06/07 21:13:09 vanquirius Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
+# To handle pre-version ...
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-utf8.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode livecd"
+
+# Note: if X or fbcon usegflag are enabled, links will be built in graphic
+# mode. libpng is required to compile links in graphic mode
+# (not required in text mode), so let's add libpng for X? and fbcon?
+
+# We've also made USE=livecd compile in graphics mode.  This closes bug #75685.
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
+	gpm? ( sys-libs/gpm )
+	javascript? ( >=sys-devel/flex-2.5.4a )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	svga? ( >=media-libs/svgalib-1.4.3
+		>=media-libs/libpng-1.2.1 )
+	X? ( virtual/x11
+		>=media-libs/libpng-1.2.1 )
+	directfb? ( dev-libs/DirectFB )
+	fbcon? ( >=media-libs/libpng-1.2.1
+		sys-libs/gpm )
+	!ppc-macos? ( livecd?
+		( >=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.1
+		sys-libs/gpm ))
+	sys-libs/zlib
+	virtual/libc
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/gcc
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/textbrowser"
+
+pkg_setup (){
+
+	if ! use gpm && use fbcon ; then
+		einfo
+		einfo "gpm has been installed since you have included fbcon in your USE flags."
+		einfo "The links framebuffer driver requires gpm in order to compile."
+		einfo
+	fi
+
+}
+
+src_unpack (){
+	unpack ${A}; cd ${S}
+
+	if use unicode ; then
+		epatch ${WORKDIR}/${MY_P}-utf8.diff
+		epatch ${FILESDIR}/${P}-auth.patch
+		export LANG=C
+		cd ${S}/intl && ./gen-intl && cd .. || die "gen-intl filed"
+	fi
+}
+
+src_compile (){
+	local myconf
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf="${myconf} --enable-graphics"
+	fi
+
+	# Note: --enable-static breaks.
+
+	# Note: ./configure only support 'gpm' features auto-detection, so
+	# we use the autoconf trick
+	( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open="no"
+
+	export LANG=C
+
+	if use fbcon || use livecd; then
+		myconf="${myconf} --with-fb"
+	else
+		myconf="${myconf} --without-fb"
+	fi
+
+	# force --with-libjpeg if livecd flag is set
+	if use livecd; then
+		myconf="${myconf} --with-libjpeg"
+	fi
+
+	# hack to allow cross-compilation
+	export CC="$(tc-getCC)"
+
+	econf \
+		$(use_with X x) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with directfb) \
+		$(use_with ssl) \
+		$(use_enable javascript) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install (){
+	einstall
+
+	# Only install links icon if X driver was compiled in ...
+	use X && doicon graphics/links.xpm
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
+	dohtml doc/links_cal/*
+
+	# Install a compatibility symlink links2:
+	dosym links /usr/bin/links2
+}
+
+
+pkg_postinst() {
+
+	if use svga
+	then
+		einfo "You had the svga USE flag enabled, but for security reasons"
+		einfo "the links2 binary is NOT setuid by default. In order to"
+		einfo "enable links2 to work in SVGA, please change the permissions"
+		einfo "of /usr/bin/links2 to enable suid."
+	fi
+}