From ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Feb 2020 18:01:47 +0000 Subject: gentoo (leap year) resync : 29.02.2020 --- sci-geosciences/liblas/Manifest | 4 ++ .../files/liblas-1.8.1-CVE-2018-20540-fixup.patch | 24 ++++++++++ .../liblas/files/liblas-1.8.1-fix-debug.patch | 18 +++++++ .../liblas/files/liblas-1.8.1-gdal-2.5.0.patch | 34 +++++++++++++ sci-geosciences/liblas/liblas-1.8.1-r3.ebuild | 55 ++++++++++++++++++++++ 5 files changed, 135 insertions(+) create mode 100644 sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch create mode 100644 sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch create mode 100644 sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch create mode 100644 sci-geosciences/liblas/liblas-1.8.1-r3.ebuild (limited to 'sci-geosciences/liblas') diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest index e3461d280127..c7b6ffc11618 100644 --- a/sci-geosciences/liblas/Manifest +++ b/sci-geosciences/liblas/Manifest @@ -1,6 +1,10 @@ AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064cef2c50d6c662ef1ca15c6beb6548d9dda056e19d2bc30fa87f067e566abf22d1c1b72496539f073d749878933c00bf7d099d8d SHA512 90defe2149a8cf8766022af6cf1248985c350e56bb9fcae99daf9551acf9272b93ea9b9c25ecef86803e75deb0ab50c2a0f919c35705d54ca38c7cafe5940f03 +AUX liblas-1.8.1-CVE-2018-20540-fixup.patch 901 BLAKE2B 81f8a3e8ea076146ad8ec258e37d75c0e3a567b1304d1283dff0151cb0a7318a70816b1dbb1c3c46ed7798be47f8a3fca4add34940150f093549fe55553d1b0f SHA512 919e91732b91e2d9b3de2365291c7679e08dd2f3d5262a2fe026ef9360be2b367bd1f3822f7fc6cead04da58c3f454066bc4776282f66d268e06cddb3be65d4a AUX liblas-1.8.1-CVE-2018-20540.patch 1628 BLAKE2B c62bf39a1dd73ec8b1d82d9c4ae499f902ce7c34d0dac20ac3fae58983048503fca393dabcae8206a5e3ef17680bfd627d2005928ce161c37073ecf4d90fb47d SHA512 549c4b29620519521bfbf3bbaa8c01c90e7bf7f7aca411822e2a846476e3cde14212049c95f51f1db981c2f4c65fd1ad1e9644691aebb9db2c4142a883a3c316 +AUX liblas-1.8.1-fix-debug.patch 600 BLAKE2B 6e8f94881f49058bb835e9978640721db4ef7a2b3e5b5a6780455146896d03ed49dcb952cdcb68c85cb47411f3abdd1a84e31200e49a50f5bdcc888464f6d791 SHA512 6e0cbce9451c0496b04da852c7b113c5a3d0b060a15675290c92b85d8c03cd59216e7fbda5d1bfe6c2a157c7777fa9f0d380034df709b20a318432ee756a4f56 AUX liblas-1.8.1-fix-overload-call.patch 641 BLAKE2B 3c4d95080a8fb33bf4652c9d2757a8c4e3bcc0eed910639dc1981fc08a9afbdc960c39f9bbcd06ca2e16091b8ca89d4deeb8424c77458f0d5161cb5c282937da SHA512 9a3b655567708b7c0e31234cb7ae92762923b5bbb13326be31f636ae6335fa726494e1be52c2e102bbf0b6702677fddf51276ce73bb996316b24377ad567a6c6 +AUX liblas-1.8.1-gdal-2.5.0.patch 1052 BLAKE2B 8686e4c02fccd1d638f7fc006a42ff7a84964bc236d8283bba24355352e2ef62a43eb8f3a44105cce516886c81cff43fb5be1162d3009b6d00a5f47425f01099 SHA512 3c784cedd45bf7fcd96438e22c5b8d672f91bcf08ce891d14aa2d6f9324f6106f8948b3002e8ceddbe03a949569b7e0a97087883eef4e79724fd33fd33d2558f DIST liblas-1.8.1.tar.gz 10734926 BLAKE2B dcd3dc043840857222e6b0a19dcb264ba34c09aa20cda9694ed182e040f9024c0b4a0e2359b1ba0da2337fa5b145aedb9a76a6dcea7ffd7cbcb125d0ae9af399 SHA512 0f8a0460e33c23c8a82eb42ab66ba69d4cc0680f6d320ce429653670f950f5724b88c5870800e0ab000e72cf0c08c55a4c468fe1b244140d867e2cb665f0f0b6 EBUILD liblas-1.8.1-r2.ebuild 1105 BLAKE2B aff71a1dd3b4775796cce7ab64422313b2c98e78077c8c69ce3eb0dfe1d49fe4f7ecaed3af5972d285c40f05b8957b996295dcaa34e0dc2ac26270666e4246de SHA512 c0c539ca00cebe2aaa63ac2711d876479738de072b407d3bf749fb31e86480106bcaba1e39903fd4783bd5e14ed3acb20306624a5dcd876c16a1813189bbfbe6 +EBUILD liblas-1.8.1-r3.ebuild 1333 BLAKE2B 3923e2d4636137859678df1098150925311ed192a6ec32c7ddd79ef8b44cbd6513f46929d8a33a3961977f18f809628b5b0d1ca755aa45c75da485a64828c683 SHA512 4bcf473335cae6fde45c2733a5014400983213a25dd3063cb39aba3d2590b2ae5f23f7e63ab3e4299701b28270943ee9ee3ee0da3ee18b82d2c48f6b7a52dfe9 MISC metadata.xml 497 BLAKE2B cdae8ef4bfaffefd73a5751950379c704581e09a9f435fc52bac7520f3632fc37007d21750616a05060e2f9213a8ee05278c565be9b80ee8529ff9e5a6c07b6c SHA512 21d5b18461e131a543ba5a5ac1b2f06652d5d49ebd0e590f0bd0971deb337efeb813698613e4bbf200a934a3afa9b20dbb80d6659778c22c8a97d9471007d3d7 diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch new file mode 100644 index 000000000000..6f0c132b5c58 --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-CVE-2018-20540-fixup.patch @@ -0,0 +1,24 @@ +From 6a666b9101293b13fde4e4eb1d2c627f7613515e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Felipe=20M=2E=20L=C3=B3pez?= +Date: Fri, 19 Jul 2019 08:26:44 +0200 +Subject: [PATCH] Always return NULL when Open() is used (#168) + +Attempt to open LAS file using standard stream, without +Boost supports built in, always failed with +"Cannot open sample.las for read. Exiting..." +--- + include/liblas/liblas.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/liblas/liblas.hpp b/include/liblas/liblas.hpp +index 325de3ff..5c950ce0 100644 +--- a/include/liblas/liblas.hpp ++++ b/include/liblas/liblas.hpp +@@ -138,6 +138,7 @@ inline std::istream* Open(std::string const& filename, std::ios::openmode mode) + ifs = new std::ifstream(); + ifs->open(filename.c_str(), mode); + if (ifs->is_open() == false) return NULL; ++ return ifs; + } + catch (...) + { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch new file mode 100644 index 000000000000..0c3b8ceec269 --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-fix-debug.patch @@ -0,0 +1,18 @@ +Description: Fix compilation with -DDEBUG and GDAL >= 2 +Author: Even Rouault +Origin: https://github.com/libLAS/libLAS/commit/72f7709bf1dfd3473b64cdba0259363d3beea3c3 + +--- a/src/gt_wkt_srs.cpp ++++ b/src/gt_wkt_srs.cpp +@@ -90,7 +90,11 @@ static const char *papszDatumEquiv[] = + /* LibgeotiffOneTimeInit() */ + /************************************************************************/ + ++#if GDAL_VERSION_MAJOR >= 2 ++static CPLMutex* hMutex = NULL; ++#else + static void* hMutex = NULL; ++#endif + + void LibgeotiffOneTimeInit() + { diff --git a/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch new file mode 100644 index 000000000000..0691c16c1b7e --- /dev/null +++ b/sci-geosciences/liblas/files/liblas-1.8.1-gdal-2.5.0.patch @@ -0,0 +1,34 @@ +From 3a572ff7e684668da62c794b37ccccbc169723de Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 26 Feb 2020 17:45:30 +0100 +Subject: [PATCH] Fix build against >=GDAL-2.5.0 + +Signed-off-by: Andreas Sturmlechner +--- + src/gt_wkt_srs.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp +index 9871aa0..099972d 100755 +--- a/src/gt_wkt_srs.cpp ++++ b/src/gt_wkt_srs.cpp +@@ -493,7 +493,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) + { + char *pszWKT; + oSRS.morphFromESRI(); +- oSRS.FixupOrdering(); + if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) + return pszWKT; + } +@@ -1094,8 +1093,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn ) + /* ==================================================================== */ + char *pszWKT; + +- oSRS.FixupOrdering(); +- + if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE ) + return pszWKT; + else +-- +2.25.1 + diff --git a/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild new file mode 100644 index 000000000000..c8f1fb5c1aa8 --- /dev/null +++ b/sci-geosciences/liblas/liblas-1.8.1-r3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +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" + +SLOT="0" +LICENSE="BSD" +KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86" +IUSE="gdal" + +DEPEND=" + dev-libs/boost:= + sci-geosciences/laszip + sci-libs/libgeotiff:= + gdal? ( sci-libs/gdal:= ) +" +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}-CVE-2018-20540.patch # bug 678482 + "${FILESDIR}"/${P}-CVE-2018-20540-fixup.patch # bug 698846 + "${FILESDIR}"/${P}-fix-debug.patch # bug 668778 +) + +src_prepare() { + use gdal && has_version ">=sci-libs/gdal-2.5.0" && PATCHES+=( + "${FILESDIR}"/${P}-gdal-2.5.0.patch # bug 707706 + ) + cmake_src_prepare + + # add missing linkage + sed -e 's:${LAS2COL} ${LIBLAS_C_LIB_NAME}:& ${CMAKE_THREAD_LIBS_INIT}:' \ + -i "${S}/apps/CMakeLists.txt" || die +} + +src_configure() { + local mycmakeargs=( + -DLIBLAS_LIB_SUBDIR=$(get_libdir) + -DWITH_GDAL=$(usex gdal) + ) + cmake_src_configure +} -- cgit v1.2.3