old

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

5 files changed, 14 insertions, 247 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index f9e27a6576ac..be348fedc278 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.154 2012/02/11 15:32:38 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.155 2012/02/11 15:33:48 ssuominen Exp $
+
+  11 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -links-2.3_pre1-r1.ebuild, -files/links-2.3_pre1-libpng-1.5.patch,
+  -files/links-2.3_pre1-verify-ssl-certs.patch:
+  old
 
   11 Feb 2012; Samuli Suominen <ssuominen@gentoo.org> links-2.4-r2.ebuild:
   ppc/ppc64 stable wrt #396519
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 4f4455ac0aca..390b40394242 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX links-2.3_pre1-libpng-1.5.patch 1232 RMD160 999358a40826d30d55eb4222358f71a7f30af9a1 SHA1 13018fbd6e89d3d64bfe436f1e681dec03b5cb15 SHA256 9109075a010ffe68f5b295a70adf573f5ec77d2ff204a7768b8f78e64eb6256a
-AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749c02a7afbc0f8c3 SHA1 4726405578261027c3d28177eae02d4d808c480f SHA256 5fb7df573de849a2bfa7ad9b7c6ce150afe3f2c42a862945fabd57ca5ae66c34
-DIST links-2.3pre1.tar.bz2 3832651 RMD160 f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de SHA1 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d SHA256 21ab49f2f24359ef2d0e634a7926f76419084bd792af28746323b2f16c229bde
 DIST links-2.4.tar.bz2 3843247 RMD160 9ede914cba25925356e3f69a3f40794821326235 SHA1 c09fcb03874b1d0586f582f73833bb2f4c9ed7ac SHA256 bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125
 DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 SHA1 fe4bc37be8aebd9196c35ffef724435cea94349c SHA256 f5c7f23f31d71d073b7b6ad2f123f3f93b07b787912b7b01b4fff565349295f2
 DIST links2_2.4-1.debian.tar.gz 20808 RMD160 cedde06aa161c9f429531e3a045230cf9e0b46ee SHA1 2caa1602dcbac0d9c0092b2eae99e0f7ae64379c SHA256 5f092ec2eef39048cee2114d9f6c32d18778e244b0217b5e38b4f92e805d235d
 DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
-EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc
 EBUILD links-2.4-r2.ebuild 3175 RMD160 03a378b7a5f100d3b7bda772ada40dec247c432b SHA1 83f227ee76f2ba8736c26eaeb01780598c82ca5c SHA256 c9f10d7cae4081e452668ff87b9202744cc3ac02e8893c23214cc58564b9c6ae
 EBUILD links-2.5.ebuild 3335 RMD160 0d0484dfd7215db7cd4b5bea926eec2b250d634d SHA1 3147e625c7b4374c69c7ee6c5dcbef6955a3facb SHA256 08091d9e9cf98cb34a3ee95f950d87e5da27be12da3a9462bc80d2cc3804c10e
-MISC ChangeLog 30973 RMD160 eea12425b3b37fa1e4600f0d5d5b652cf8dc6a98 SHA1 c68d1e74ff7f5b15625f5f67c04fe0c2b0571e67 SHA256 350a44fc2e1007ae59df645ba94972d982beb3c07a379a520751e8c7a52906dc
+MISC ChangeLog 31151 RMD160 dddf336f1a8b51ae73a046010575a1e138ec5da1 SHA1 554a4540aacc1691d813d19f7a841973bf7b8260 SHA256 1fee29e57e7bb5193f55dbcc3fcc5cb024c874c08d19eb77f813c07a7f1da6ce
 MISC metadata.xml 342 RMD160 f48da44e2ff7ef33505a66744713dde872654bf5 SHA1 09f4631fef863d70a152eec29c2455243413c9ee SHA256 264e605d3878a9b815b642d43c413afd628f1945e9a875fc31eaf7e2cef0a085
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPNolJAAoJEEdUh39IaPFNrdEH/iZ09+h4yS//I/MEzAG90VFI
-uBg3ImhtYtOSU6W0DmwLWrVIdfHR3fWkEuVHzecUQUAkhTBrinvr6iBIqMhDMewQ
-7gybtq7V5rMP0tU4spVHgcnHJCv6CoR1KNAHN+Ietj4gfUFDHVM8N3/1AQx4Gj6i
-oyDynZznhE+sgvaq7ABFYy3JZ2Fc30uky0ko6Ttt6XRTml9dvog7vTZbrxrt43LK
-12cKnsmJPc1mzFy4GgvvtEruGKSCAbPjRK3L9Nv6fcmfhrQAVGlUK5wCBzHvZhrL
-FJQHrM0GcURaU07PYM9vHO3KWE05MaPVHFBXdi0BW6gbt/+ofh78hh4qkqXAvaY=
-=euZf
+iQEcBAEBAgAGBQJPNomOAAoJEEdUh39IaPFNNlMH/A9j6mAgzSA4XkG2Vg0AVeld
+QwrhwSqrsv5ov3y9ntk8w1pYN8HeP7u2dOdRROxJkzY/zFK6VOWTOz8aGzMlKRY5
+/onR8X3NZ0xvnFrpZKSjEJ4ilRwR/FAiS1IFZfcfS3/+qV2bk34I6QvGtEpmdZio
+UsgJBZ9afHLo57Q5fLKoq6cShs0IkHmClf3dbG11IkSaGaJ0HD5Nj00fNmAIxQGu
+dZnGp15vD52fFDwnVI12mSp0cgRPxyyMFJioaLWGDuzaXa4B4sH7Ey8PKvIAnsDq
+tAYqi4yOGizegzY3tUFciK0kp7T+ODf0ZdpK1vCMxufSmORimC2AcohOtY2/v8I=
+=gWj/
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/files/links-2.3_pre1-libpng-1.5.patch b/www-client/links/files/links-2.3_pre1-libpng-1.5.patch
deleted file mode 100644
index 81b3c69b2a03..000000000000
--- a/www-client/links/files/links-2.3_pre1-libpng-1.5.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- png.c.orig	2011-02-20 12:47:07.000000000 -0500
-+++ png.c	2011-02-20 12:47:58.000000000 -0500
-@@ -48,7 +48,7 @@
- /* Error for from-web PNG images. */
- void img_my_png_error(png_structp png_ptr, png_const_charp error_string)
- {
--	longjmp(png_ptr->jmpbuf,1);
-+	longjmp(png_jmpbuf(png_ptr),1);
- }
- 
- void png_info_callback(png_structp png_ptr, png_infop info_ptr)
-@@ -204,7 +204,7 @@
- #ifdef DEBUG
- 	if (!info_ptr) internal ("png_create_info_struct failed\n");
- #endif /* #ifdef DEBUG */
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- error:
- 		png_destroy_read_struct(&png_ptr, &info_ptr,
- 			(png_infopp)NULL);
-@@ -214,7 +214,7 @@
- 	png_set_progressive_read_fn(png_ptr, NULL,
- 				    png_info_callback, png_row_callback,
- 				    png_end_callback);
--   	if (setjmp(png_ptr->jmpbuf)) goto error;
-+   	if (setjmp(png_jmpbuf(png_ptr))) goto error;
- 	decoder=mem_alloc(sizeof(*decoder));
- 	decoder->png_ptr=png_ptr;
- 	decoder->info_ptr=info_ptr;
-@@ -233,7 +233,7 @@
- 	png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr;
- 	info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr;
- 	end_callback_hit=0;
--	if (setjmp(png_ptr->jmpbuf)){
-+	if (setjmp(png_jmpbuf(png_ptr))){
- 		img_end(cimg);
- 		return;
- 	}
diff --git a/www-client/links/files/links-2.3_pre1-verify-ssl-certs.patch b/www-client/links/files/links-2.3_pre1-verify-ssl-certs.patch
deleted file mode 100644
index 05975972e5f1..000000000000
--- a/www-client/links/files/links-2.3_pre1-verify-ssl-certs.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-snipped from Debian
-http://bugs.gentoo.org/253847
-
-Patch to abort if SSL certificate isn't valid to fix #510417.
-
-Patch by Mats Erik Andersson <mats.andersson@gisladisker.se> as posted at 
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510417
-
-Index: links2-2.3pre1/https.c
-===================================================================
---- links2-2.3pre1.orig/https.c	2009-05-17 21:33:01.000000000 +0200
-+++ links2-2.3pre1/https.c	2010-07-08 18:36:22.000000000 +0200
-@@ -25,8 +25,40 @@
- 
- #ifdef HAVE_SSL
- 
-+#define VERIFY_DEPTH	10
-+
- SSL_CTX *context = NULL;
- 
-+static int verify_cert(int code, X509_STORE_CTX *context)
-+{
-+	int error, depth;
-+
-+	error = X509_STORE_CTX_get_error(context);
-+	depth = X509_STORE_CTX_get_error_depth(context);
-+
-+	if (depth > VERIFY_DEPTH) {
-+		error = X509_V_ERR_CERT_CHAIN_TOO_LONG;
-+		code = 0;
-+	}
-+
-+	if (!code) {
-+		/* Judge self signed certificates as acceptable. */
-+		if (error == X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN ||
-+				error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) {
-+			code = 1;
-+		} else {
-+			fprintf(stderr, "Verification failure: %s\n",
-+						X509_verify_cert_error_string(error));
-+			if (depth > VERIFY_DEPTH) {
-+				fprintf(stderr, "Excessive depth %d, set depth %d.\n",
-+							depth, VERIFY_DEPTH);
-+			}
-+		}
-+	}
-+
-+	return code;
-+} /* verify_cert */
-+
- SSL *getSSL(void)
- {
- 	if (!context) {
-@@ -44,8 +76,10 @@
- 		if (!m) return NULL;
- 		context = SSL_CTX_new(m);
- 		if (!context) return NULL;
--		SSL_CTX_set_options(context, SSL_OP_ALL);
-+		SSL_CTX_set_options(context, SSL_OP_NO_SSLv2 | SSL_OP_ALL);
-+		SSL_CTX_set_mode(context, SSL_MODE_AUTO_RETRY);
- 		SSL_CTX_set_default_verify_paths(context);
-+		SSL_CTX_set_verify(context, SSL_VERIFY_PEER, verify_cert);
- /* needed for systems without /dev/random, but obviously kills security. */
- 		/*{
- 			char pool[32768];
diff --git a/www-client/links/links-2.3_pre1-r1.ebuild b/www-client/links/links-2.3_pre1-r1.ebuild
deleted file mode 100644
index 21fd959c8071..000000000000
--- a/www-client/links/links-2.3_pre1-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.3_pre1-r1.ebuild,v 1.8 2011/11/16 10:15:12 jlec Exp $
-
-# SDL support is disabled in this version by upstream
-
-EAPI="2"
-
-inherit eutils autotools
-
-# To handle pre-version ...
-MY_P="${P/_/}"
-DESCRIPTION="links is a fast lightweight text and graphic web-browser"
-HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://links.twibright.com/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 directfb fbcon gpm jpeg livecd ssl svga tiff unicode X zlib"
-
-# 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.
-
-#	sdl? ( >=media-libs/libsdl-1.2.0 )
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
-	gpm? ( sys-libs/gpm )
-	jpeg? ( virtual/jpeg )
-	fbcon? (
-		>=media-libs/libpng-1.4:0
-		virtual/jpeg
-		sys-libs/gpm
-	)
-	tiff? ( >=media-libs/tiff-3.5.7:0 )
-	svga? (
-		>=media-libs/svgalib-1.4.3
-		>=media-libs/libpng-1.4:0
-	)
-	X? (
-		x11-libs/libXext
-		>=media-libs/libpng-1.4:0
-	)
-	directfb? ( dev-libs/DirectFB )
-	sys-libs/ncurses
-	livecd? (
-		>=media-libs/libpng-1.4:0
-		virtual/jpeg
-		sys-libs/gpm
-	)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
-	epatch "${FILESDIR}"/${P}-verify-ssl-certs.patch #253847
-
-	if use unicode ; then
-		pushd intl >/dev/null
-		./gen-intl || die
-		./synclang || die
-		popd >/dev/null
-	fi
-
-	# Upstream configure produced by broken autoconf-2.13.  See #131440 and
-	# #103483#c23.  This also fixes toolchain detection.
-	eautoconf || die
-}
-
-src_configure() {
-	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"
-
-	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
-
-	#	$(use_with sdl)
-	econf \
-		$(use_with X x) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		$(use_with svga svgalib) \
-		$(use_with directfb) \
-		$(use_with ssl) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		${myconf}
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	# Only install links icon if X driver was compiled in ...
-	use X && doicon graphics/links.xpm
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README SITES TODO
-	dohtml doc/links_cal/*
-
-	# Install a compatibility symlink links2:
-	dosym links /usr/bin/links2
-}
-
-pkg_postinst() {
-	if use svga ; then
-		elog "You had the svga USE flag enabled, but for security reasons"
-		elog "the links2 binary is NOT setuid by default. In order to"
-		elog "enable links2 to work in SVGA, please change the permissions"
-		elog "of /usr/bin/links2 to enable suid."
-	fi
-}