summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-07-18 03:00:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-07-18 10:31:58 +0200
commit3d590f5ec305ccd3c2bb60f38f0fd47167f4dd3e (patch)
tree092706203c192f5bd957670f694769f51de2d9ef /media-gfx/exiv2
parentmedia-sound/qastools: Drop 0.21.0 (diff)
downloadgentoo-3d590f5ec305ccd3c2bb60f38f0fd47167f4dd3e.tar.gz
gentoo-3d590f5ec305ccd3c2bb60f38f0fd47167f4dd3e.tar.bz2
gentoo-3d590f5ec305ccd3c2bb60f38f0fd47167f4dd3e.zip
media-gfx/exiv2: Drop vulnerable 0.27.2
Bug: https://bugs.gentoo.org/701902 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/exiv2')
-rw-r--r--media-gfx/exiv2/Manifest1
-rw-r--r--media-gfx/exiv2/exiv2-0.27.2.ebuild104
-rw-r--r--media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch56
3 files changed, 0 insertions, 161 deletions
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest
index 4946e9e6a686..53c6bf2b073e 100644
--- a/media-gfx/exiv2/Manifest
+++ b/media-gfx/exiv2/Manifest
@@ -1,2 +1 @@
-DIST exiv2-0.27.2-Source.tar.gz 27591236 BLAKE2B bd10d71356e4c8a465b71f8ceac07fbf2fd6cfb287cb22774568ad35eb38200be504e297224920af50a15ab4e9da98384ff4da7c33713f5346b33738380698b0 SHA512 39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721
DIST exiv2-0.27.3-Source.tar.gz 26447901 BLAKE2B ac13e6d8fce83923278cfeb628f143310a3c62b42936c8ed8b302a2c3df4c36f5666fa749adfb1d745e42da8f519762532e6fc281993aa55bcd7ce56e08c6e3e SHA512 3f5758ee862b811eeb89cc75fc2bbd8bf10329efa2ce1e68555cdc7729faa6cfd1603e0cc859fbdbe6d8fd5e53bd9b9e6d869d8a20ed17497bf87ce78c005de9
diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild
deleted file mode 100644
index fff1d66eeb26..000000000000
--- a/media-gfx/exiv2/exiv2-0.27.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999 ]]; then
- EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git"
- inherit git-r3
-else
- SRC_URI="https://exiv2.org/builds/${P}-Source.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-fi
-
-CMAKE_ECLASS=cmake
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-multilib python-any-r1
-
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility"
-HOMEPAGE="https://www.exiv2.org/"
-
-LICENSE="GPL-2"
-SLOT="0/27"
-IUSE="doc examples nls +png webready +xmp"
-
-BDEPEND="
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- dev-libs/libxslt
- media-gfx/graphviz
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
-"
-DEPEND="
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- png? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
- webready? (
- net-libs/libssh[${MULTILIB_USEDEP}]
- net-misc/curl[${MULTILIB_USEDEP}]
- )
- xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md doc/ChangeLog doc/cmd.txt )
-
-PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
-
-S="${S}-Source"
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # FIXME @upstream:
- einfo "Converting doc/cmd.txt to UTF-8"
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die
-
- cmake_src_prepare
-
- sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DEXIV2_BUILD_SAMPLES=NO
- -DEXIV2_BUILD_PO=$(usex nls)
- -DEXIV2_ENABLE_NLS=$(usex nls)
- -DEXIV2_ENABLE_PNG=$(usex png)
- -DEXIV2_ENABLE_CURL=$(usex webready)
- -DEXIV2_ENABLE_SSH=$(usex webready)
- -DEXIV2_ENABLE_WEBREADY=$(usex webready)
- -DEXIV2_ENABLE_XMP=$(usex xmp)
- $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO)
- $(multilib_is_native_abi && echo -DEXIV2_BUILD_DOC=$(usex doc))
- -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
- )
-
- cmake_src_configure
-}
-
-multilib_src_compile() {
- cmake_src_compile
-
- if multilib_is_native_abi; then
- use doc && eninja doc
- fi
-}
-
-multilib_src_install_all() {
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} )
-
- einstalldocs
- find "${D}" -name '*.la' -delete || die
-
- if use examples; then
- docinto examples
- dodoc samples/*.cpp
- fi
-}
diff --git a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch b/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
deleted file mode 100644
index abf165b83f47..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.27.2-libssh-0.9.2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c59eb810728572fde84492d43a932dcac89746d6 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Thu, 14 Nov 2019 15:06:38 +0100
-Subject: [PATCH] EXIV2_ENABLE_SSH: Fix compatibility with >=libssh-0.9.2
-
-0.9.1 remains broken regardless and is beyond fixing in this place.
-
-Build-tested with both libssh 0.9.0 and 0.9.2.
-
-Solution copied from KDE's kio-extras commit 24506c2af8d1904a99538543804306c6c2b81ca2
----
- cmake/findDependencies.cmake | 13 +++++++++++--
- src/CMakeLists.txt | 3 +--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/findDependencies.cmake b/cmake/findDependencies.cmake
-index a458a0c9..ec3a43f5 100644
---- a/cmake/findDependencies.cmake
-+++ b/cmake/findDependencies.cmake
-@@ -26,8 +26,17 @@ if( EXIV2_ENABLE_WEBREADY )
-
- if( EXIV2_ENABLE_SSH )
- find_package(libssh CONFIG REQUIRED)
-- endif( )
--endif( )
-+ # Define an imported target to have compatibility with <=libssh-0.9.0
-+ # libssh-0.9.1 is broken regardless.
-+ if(NOT TARGET ssh)
-+ add_library(ssh SHARED IMPORTED)
-+ set_target_properties(ssh PROPERTIES
-+ IMPORTED_LOCATION "${LIBSSH_LIBRARIES}"
-+ INTERFACE_INCLUDE_DIRECTORIES "${LIBSSH_INCLUDE_DIR}"
-+ )
-+ endif()
-+ endif()
-+endif()
-
- if (EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP)
- message(FATAL_ERROR "EXIV2_ENABLE_XMP AND EXIV2_ENABLE_EXTERNAL_XMP are mutually exclusive. You can only choose one of them")
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 27f8dbb1..bdd83fa0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -173,8 +173,7 @@ target_include_directories(exiv2lib_int PUBLIC
- if (EXIV2_ENABLE_WEBREADY)
-
- if( EXIV2_ENABLE_SSH )
-- target_include_directories(exiv2lib SYSTEM PUBLIC ${LIBSSH_INCLUDE_DIR})
-- target_link_libraries(exiv2lib PUBLIC ${LIBSSH_LIBRARIES})
-+ target_link_libraries(exiv2lib PUBLIC ssh)
- endif()
-
- if( EXIV2_ENABLE_CURL )
---
-2.24.0
-