gentoo resync : 02.06.2019

3 files changed, 70 insertions, 13 deletions

diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index f9e4f2155795..b91799176fdf 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -1,7 +1,8 @@
 AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03
+AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316
 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6
 DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
 DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6
-EBUILD liblas-1.8.1-r1.ebuild 1074 BLAKE2B 9d98bcc272519372f35e5cbe1207a2f112a39acf23e6aeb9f89018b34ef8f3a53df8184218a1db6dc4c25452c644c388f0683a023a409308d7b0efbed14cb07c SHA512 59bbe726ee289aef3d13fcda97aa17404071f909bb463d0290e116d7ddb8b215973d5c4e387b8a848e5b0788d82c8b2b1946f58c57d0d3ff98e1adebd29e5818
+EBUILD liblas-1.8.1-r2.ebuild 1124 BLAKE2B 4019f34d95ec9758cd1fc03a50518736c9701cbbfaaf5eaac815b6972a6496cdd380822aabc8cc49b6fe5223034d34f59280c15bf640b3a6a34404bff86b8556 SHA512 91eca43db17d7a8b28e1c036fe6956bf42063836cec160b978fd182e9e4625c705cd3bc9d4b9b4348498acb2776dcaa24077c32228718cebf66498c195f88bd3
 EBUILD liblas-1.8.1.ebuild 986 BLAKE2B c9af42b8c995edc65e44129edb303a61df2a154ece99e1772520a5debd96803e5be5a1d6d72a0297371b6d236910aef3aa3c68f2853ccd5dbad366becfe2d84a SHA512 2f5ccdcc9ad4a14f868f6d3996079fd0030e369e3cfb02fa0bda923cd8122fa78e2c4472ede1c6258955d35cbc7b34092d7ebf66e20f4aadd3249dd9553cfece
 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7
diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
new file mode 100644
index 000000000000..ab2174f04ff0
--- /dev/null
+++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540.patch
@@ -0,0 +1,55 @@
+From 09d45518776489508f34098f1c159f58b856f459 Mon Sep 17 00:00:00 2001
+From: Mateusz Loskot <mateusz@loskot.net>
+Date: Sun, 20 Jan 2019 02:28:29 +0100
+Subject: [PATCH] Ensure stream is deallocated in case of exception (#162)
+
+Fixes #158
+---
+ include/liblas/liblas.hpp | 32 ++++++++++++++++++++++++--------
+ 1 file changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp
+index f5ad44e1..325de3ff 100644
+--- a/include/liblas/liblas.hpp
++++ b/include/liblas/liblas.hpp
+@@ -119,16 +119,32 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode)
+ {
+ #ifdef USE_BOOST_IO
+     namespace io = boost::iostreams;
+-    io::stream<io::file_source>* ifs = new io::stream<io::file_source>();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    io::stream<io::file_source>* ifs = NULL;
++    try
++    {
++        ifs = new io::stream<io::file_source>();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++        return ifs;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #else
+-    std::ifstream* ifs = new std::ifstream();
+-    ifs->open(filename.c_str(), mode);
+-    if (ifs->is_open() == false) return NULL;
+-    return ifs;
++    std::ifstream* ifs = NULL;
++    try
++    {
++        ifs = new std::ifstream();
++        ifs->open(filename.c_str(), mode);
++        if (ifs->is_open() == false) return NULL;
++    }
++    catch (...)
++    {
++        delete ifs;
++    }
+ #endif
++    return NULL;
+ }
+ 
+ /// Create file and open to write in binary mode.
diff --git a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
index 8e0dbdea8572..0380dffd2f3a 100644
--- a/sci-geosciences/liblas/liblas-1.8.1-r1.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils
 
@@ -9,27 +9,28 @@ DESCRIPTION="C/C++ library for manipulating the LAS LiDAR format common in GIS"
 HOMEPAGE="https://github.com/libLAS/libLAS/"
 SRC_URI="https://github.com/libLAS/libLAS/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-# tests known to fail due to LD_LIBRARY_PATH issue
-RESTRICT="test"
-
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ppc ppc64 ~x86"
 IUSE="gdal"
 
-RDEPEND="
+DEPEND="
 	dev-libs/boost:=
 	sci-geosciences/laszip
-	sci-libs/libgeotiff
-	gdal? ( sci-libs/gdal )
+	sci-libs/libgeotiff:=
+	gdal? ( sci-libs/gdal:= )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
+
+# tests known to fail due to LD_LIBRARY_PATH issue
+RESTRICT="test"
 
 S="${WORKDIR}/libLAS-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.0_remove-std-c++98.patch
-	"${FILESDIR}"/${P}-fix-overload-call.patch #bug 661654
+	"${FILESDIR}"/${P}-fix-overload-call.patch # bug 661654
+	"${FILESDIR}"/${P}-CVE-2018-20540.patch # bug 678482
 )
 
 src_prepare() {
@@ -42,8 +43,8 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		"-DWITH_GDAL=$(usex gdal)"
 		-DLIBLAS_LIB_SUBDIR=$(get_libdir)
+		-DWITH_GDAL=$(usex gdal)
 	)
 	cmake-utils_src_configure
 }