Use updated security patch verify-ssl-certs-510417.diff from Debian patchset 2.8-1

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 148 insertions, 9 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index ffe680b1819d..36cc9ea174b6 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.191 2013/09/23 09:45:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.192 2013/10/04 05:40:02 ssuominen Exp $
+
+*links-2.8-r1 (04 Oct 2013)
+
+  04 Oct 2013; Samuli Suominen <ssuominen@gentoo.org> +links-2.8-r1.ebuild:
+  Use updated security patch verify-ssl-certs-510417.diff from Debian patchset
+  2.8-1
 
 *links-2.8 (23 Sep 2013)
 
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index b4f062b30c4c..39f1611288a4 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -4,18 +4,20 @@ Hash: SHA256
 DIST links-2.7.tar.bz2 3884511 SHA256 0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130 SHA512 b70d3984b34e795c4c08608a9b66e6b1f60503585a38dda18f1556c579df2ba542fb508adc97e82977dec9d94f29d0b367e79d20264918c36c5e5bdd6b4a67e4 WHIRLPOOL 916ed628f4951c33832ec5ec1a3dea3a121ceca6a6eb3e53c5ea1c6fb5193d25a73ccdbfdc09ad4bd0a1e8e3d6e17384bb5a284ba0a40b659187442f84d65dce
 DIST links-2.8.tar.bz2 4102643 SHA256 7950da386fa2014d75edc23abfaeed1b1f171ebc73bf0f557352948f12390096 SHA512 e6325be0bb81a9f4dc602f9c05150ebc3c4e16373767c284c02a87bd6b89b9a28ff409c175695542277faa361b71151c5c619135f36a59a04558fc3426c4b30a WHIRLPOOL d5233857bb057279b54883fc9026b5a35e22116ba9f9bb00971872d8a4a658c9fc20b765abd50328c5f1e835ab03e32f9432115671a74c729510d46b53f5d0eb
 DIST links2_2.7-1.debian.tar.gz 12430 SHA256 87955ae64b20beeb5abbfc7223eb8e7f8a8f6343bb511d7bc954a5f8085d8a8a SHA512 7a9a13dd9fcaf76e7692a82c6bd480846b7adf23d9b81b2ba2bfdd15c4fcb3fbff44f0443dbca484237c53fffc07749e23cbe828eb1d656c5823b9491d47a0ae WHIRLPOOL e9889825d923420d50af990a324d0befff4f79738eb67fbc479287fc2a23155ecae6d6100b9a2bc4ae262e9e547913caaf7bddc73eadaffbdc5fdc0f8e87294a
+DIST links2_2.8-1.debian.tar.gz 12121 SHA256 878529c4f93c934c1821edc3576ca6219bc4018f4e29866d6ffa469681a0bd80 SHA512 134fb292c88ec4d36529886d0e5d12083b773f38b89cb90b471b5f6b11d7f8d990de0a57ade5eb5f887cf1c4398687a6e81aed4a660959e81219c675c1de6af2 WHIRLPOOL e9c362de5874ca8de96a2ef184c81e40fa365e9d4e20c4a902845749946a438060ef2784e87972d40c459d4979e0e0ffc8158a5dcab1e02fc3980413c79edfc4
 EBUILD links-2.7.ebuild 3554 SHA256 4139625acdcd42cb91884d28e8a891d2897815535d875e8fbec38ff17f76398c SHA512 4741238a5601496a3a4ff88387e574757bf0d22c6d653e1f36961138bc90645ba9b3c251b9d2b13faf72b565ae6db83fb5526b3a9e1551e70fbd22eccf3518a3 WHIRLPOOL ce8a695aaa6d26138befcccc141878ca58f99e051d070456037cb1f8340738b8837aa55e6665e762900d8142ff98b25c82e6fa5b18e7d1ef15bd6e84d7de172c
+EBUILD links-2.8-r1.ebuild 3319 SHA256 5114df3117a4a6a8be3af52151eaca748b254f2f3b9cab484d420db46f4e7b70 SHA512 762a2638c827d8ada33c1f1cf6164a317fd0517d2d6dddc7c12b9837cf75083a9d51dbf1a4df6c57938df6667c7bdd4999eb4385a91d60e4922b088b23ac6cc2 WHIRLPOOL d8f2badade72a7fb1c0cb8efeeca66710f9fc9e8bc5e37632dcf5651291261d6ffc3abfd2bbd2a2b674b6e1c5615a41dd2d6c9290c541c1661067316f3815cd3
 EBUILD links-2.8.ebuild 3143 SHA256 958b7f5bd8f0070e769bdfbeed48b479a74d555cae45d17345a00fbf53fd16f5 SHA512 e6d35614f8b35802fcc4e5df14f429f585eadf8070f7add18b68e9ec0f600cb98b0a904def3adf538ffb618aceb598f9151653df2b754b8a61f4e603c978a3d3 WHIRLPOOL 38c7ff86afc898207857c480633bea5ebab1fe05a054baacd8caa09ec1cfb2bf8f312d86663cec0ccf6ca453111637b697f233e77d8b8ba00f0355b58fa829c5
-MISC ChangeLog 35738 SHA256 83575f40d4ab588eb59d23e7635ebc2cc291fa2d35588e4fd6d1dd491ba8cc2f SHA512 ab4f6ec908561de6de0a8a6045c78e8e3f828360016e3b2f9eb52365641358a30378edd1b50f8d65ffc6e20fe7dea7f8825968aba50b46223f31ff31dd47d409 WHIRLPOOL ed5fbd3fefcb23db552dbe8eb1b8c2840d54c2b4663ad57d5b97e01cd3bcdf10f6059c59abbcd24e26ac13a52855d18fa198a6f0cddae17edb0872c68c794699
+MISC ChangeLog 35931 SHA256 1c1455a83a30446945342e15c5b6d6b67aff80c8747c6e312988dedccc033261 SHA512 cde4114b15e112bdca7fe4262fa62cf5c074ace6a5a52598e625bb5b1d90f153c870414e6ab23f99be3561530df9a30e43301a090e5c9468ce6f652d96cb0f64 WHIRLPOOL 59a036595335a24d5e44bc54329f584e960d0cda2f5e019b99af3c26ed45e16bcaff02a260121b264c57ad975ddb5a6cb86a7b24deaf8801b2a8f0bbe7a6139b
 MISC metadata.xml 475 SHA256 47cdac116651eba8a04d0e7a0560d5013bc967ce3aa2d86f61ee8688649a3916 SHA512 f2708fbdcbcdadb6dcc11945e84a72d5371e1ddb50c85d51c42d554d11e9f6c4ab5178e90d516442a68b3f49e11ca171abebc6842f7920b75ac9151253ab2dd9 WHIRLPOOL e1dc8232c53e4585c4cc2258722217f242349c0de12a2b67f005eb5ef7bf79f227263d50adedb34fc6c6f6597f4e8b95be5baf1a94c206d33f781e77af7168fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQA2WAAoJEEdUh39IaPFNwBcH/3/1XgWgONBIQsjyDqBURYzs
-uuG1EEP5IQLkZl7zzKo/SXSvrp28BzTRb2CUz/t8jBt006pO0NWKc5ubkoUFsEb8
-VNKJ7Oua81TVqhv2ZMqtZKa+db1W7FC9eeZFH3UtrzxZXoJe0i4SNU3WOCQ6RUxd
-wLb9kKGyUmOXZ0kKY8pU20/dGmpc+HW/+pDK15s4xRABmXjThs0JUi2yD51MtFG/
-z9UGWHJ+CpzWU+Ywl8zWhMDx+1FVg17J7WE4P2j7JTVQ+RzfGvkrDsY0ozI3H/7G
-0mqenJGgW+kLk7zVLL2Op+vmF+CUHN9GnLI39MwHqGrpQNNecsMV3ZDNFrwp3gc=
-=ZZYd
+iQEcBAEBCAAGBQJSTlQ7AAoJEEdUh39IaPFNGGkH/RoQrSsSqK4InZ2T6aDEVAdh
+gxH7F+WBnHnqviJ1SFSOs8BVZGWbkJ2FHOslrQCVbgGIqH0dqKCTLnu0UdlxNpve
+tT2a9edP+ulR/glfeqjbiMn0aGCRLokA9DDiFRvsAKwmlwQwV9s9rXgAkL6OR/N/
+n8gattjxJemjKd1t+bAxszx5CFkj4rEdvbcSj1kHKJG5iY3qQ5Gay+umFhXA+wyN
+ed3VfGX+bpptfbxrE4gTlSPo3eskl3MEYyOtnegivP15yUa3BuB/Tq80c1vTqBtU
+lG2D+ZkgzTQj0PPDAsnanlb/iHWqZG6t1B6nh7pnVdkbsHmndV947v5TzBnsXr4=
+=+KGk
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.8-r1.ebuild b/www-client/links/links-2.8-r1.ebuild
new file mode 100644
index 000000000000..275ec1d754ec
--- /dev/null
+++ b/www-client/links/links-2.8-r1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.8-r1.ebuild,v 1.1 2013/10/04 05:40:02 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime
+
+DEBIAN_REVISION=2.8-1
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
+	mirror://debian/pool/main/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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 ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7
+	bzip2? ( app-arch/bzip2 )
+	directfb? (
+		${GRAPHICS_DEPEND}
+		dev-libs/DirectFB
+		)
+	fbcon? ( ${GRAPHICS_DEPEND} )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg:0 )
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+		)
+	lzma? ( app-arch/xz-utils )
+	ssl? ( dev-libs/openssl:0 )
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+		)
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+		)
+	zlib? ( sys-libs/zlib )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.diff
+
+	if use unicode; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		$(use_with ipv6) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		$(use_with lzma) \
+		$(use_with svga svgalib) \
+		$(use_with X x) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
+		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop
+	fi
+
+	nonfatal dohtml doc/links_cal/*
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && fdo-mime_desktop_database_update
+}