bug 100545, version bump 2.1_pre18

Package-Manager: portage-2.0.51.22-r2

8 files changed, 23 insertions, 176 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 6132fa79720b..774209f50443 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,15 @@
 # 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.27 2005/08/02 12:30:57 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.28 2005/08/28 22:14:40 vanquirius Exp $
+
+*links-2.1_pre18 (28 Aug 2005)
+
+  28 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/links-2.1_pre17-auth.patch, -links-2.1_pre17.ebuild,
+  -links-2.1_pre17-r2.ebuild, +links-2.1_pre18.ebuild:
+  Version bump. Fixes javascript problem reported in bug 100545. Thanks to
+  bkgood@gmail.com, Ciaran Hamilton <gentoo-bugs@theblob.org>, Mrugesh Karnik
+  <floyd_n_milan@yahoo.com> and Andrea Barisani<lcars@gentoo.org>.
 
   02 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> links-2.1_pre17-r1.ebuild:
   Stable on sh.
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index ec49d10d86cc..633930827189 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,21 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 24a20a674024ac38d4418b466d43c355 links-2.1_pre17-r2.ebuild 3678
-MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
-MD5 f52d75ed8376debd8780fa0a4d56ecf0 links-2.1_pre17.ebuild 3179
-MD5 dd6e87b411cc10196c74e589c75e2af7 links-2.1_pre17-r1.ebuild 3508
 MD5 23210c68197b9588f90f4f89cefa2ded links-2.1_pre15.ebuild 3164
-MD5 a995b45a83b6c904a1eb02e02ffa57d6 ChangeLog 14436
-MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
-MD5 c2ff68f6718818b0e7da326d91d25a5e files/links-2.1_pre17-auth.patch 1026
-MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17 139
-MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r2 139
+MD5 dd6e87b411cc10196c74e589c75e2af7 links-2.1_pre17-r1.ebuild 3508
+MD5 71d79b63a93508407e6e69748fe4be5f links-2.1_pre18.ebuild 3738
+MD5 329691a4bd3f436dc4cdf04da458aa8f ChangeLog 14862
+MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
 MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r1 139
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDAXCCgIKl8Uu19MoRAghZAJ9rvdQPkuM0vSHjebpHwQx2ecx8VgCeJR6U
-FaeuVuqZmxdnBBoqYOMMzD4=
-=SQiM
------END PGP SIGNATURE-----
+MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
+MD5 4ecf3369d346051658758f76dbd89eb5 files/digest-links-2.1_pre18 139
diff --git a/www-client/links/files/digest-links-2.1_pre17 b/www-client/links/files/digest-links-2.1_pre17
deleted file mode 100644
index 7ed0613440cb..000000000000
--- a/www-client/links/files/digest-links-2.1_pre17
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 94315d9ba68bbb543d93b3b3b4f07582 links-2.1pre17.tar.bz2 3829168
-MD5 5f8700ad2fc388bc3bd7d7a73bb0e987 links-2.1pre17-utf8.diff.bz2 4151
diff --git a/www-client/links/files/digest-links-2.1_pre17-r2 b/www-client/links/files/digest-links-2.1_pre17-r2
deleted file mode 100644
index 7ed0613440cb..000000000000
--- a/www-client/links/files/digest-links-2.1_pre17-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 94315d9ba68bbb543d93b3b3b4f07582 links-2.1pre17.tar.bz2 3829168
-MD5 5f8700ad2fc388bc3bd7d7a73bb0e987 links-2.1pre17-utf8.diff.bz2 4151
diff --git a/www-client/links/files/digest-links-2.1_pre18 b/www-client/links/files/digest-links-2.1_pre18
new file mode 100644
index 000000000000..b48d5255eed6
--- /dev/null
+++ b/www-client/links/files/digest-links-2.1_pre18
@@ -0,0 +1,2 @@
+MD5 4e2a5b23325db1be44250ae5644d4a8c links-2.1pre18.tar.bz2 5443919
+MD5 cf5eb10a4b6b0359339742316222bc25 links-2.1pre18-utf8.diff.bz2 4076
diff --git a/www-client/links/files/links-2.1_pre17-auth.patch b/www-client/links/files/links-2.1_pre17-auth.patch
deleted file mode 100644
index 057aaa491357..000000000000
--- a/www-client/links/files/links-2.1_pre17-auth.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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.ebuild b/www-client/links/links-2.1_pre17.ebuild
deleted file mode 100644
index 24eb8dc9987b..000000000000
--- a/www-client/links/links-2.1_pre17.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.ebuild,v 1.11 2005/05/28 08:20:30 vapier Exp $
-
-inherit eutils
-
-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 ~ppc-macos ppc64 s390 sparc x86"
-IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode"
-
-# 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?
-
-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 )
-	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
-		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; 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 ) || export ac_cv_lib_gpm_Gpm_Open="no"
-
-	export LANG=C
-
-	econf \
-		$(use_with X x) \
-		$(use_with png libpng) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_with svga svgalib) \
-		$(use_with fbcon fb) \
-		$(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 && { insinto /usr/share/pixmaps ;	doins 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
-}
diff --git a/www-client/links/links-2.1_pre17-r2.ebuild b/www-client/links/links-2.1_pre18.ebuild
index fbcf335d8431..a2fcc6016d19 100644
--- a/www-client/links/links-2.1_pre17-r2.ebuild
+++ b/www-client/links/links-2.1_pre18.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/06/09 01:14:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre18.ebuild,v 1.1 2005/08/28 22:14:40 vanquirius Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,12 +9,13 @@ 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"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~vanquirius/files/${MY_P}-utf8.diff.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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86 ~sh"
 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
@@ -53,14 +54,12 @@ DEPEND="${RDEPEND}
 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 (){
@@ -68,7 +67,6 @@ src_unpack (){
 
 	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
@@ -131,7 +129,6 @@ src_install (){
 
 
 pkg_postinst() {
-
 	if use svga
 	then
 		einfo "You had the svga USE flag enabled, but for security reasons"