| 1 |
commit: d6652e1db55b96b632f0cdbf5988b4ce213146bd |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 11 06:13:48 2019 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 11 06:14:00 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6652e1d |
| 7 |
|
| 8 |
media-gfx/exiv2: remove vulnerable 0.26_p20180811-r3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 11 |
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org> |
| 12 |
|
| 13 |
media-gfx/exiv2/Manifest | 1 - |
| 14 |
media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild | 123 --------------------- |
| 15 |
media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch | 83 -------------- |
| 16 |
.../exiv2/files/exiv2-0.26-tools-optional.patch | 28 ----- |
| 17 |
4 files changed, 235 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest |
| 20 |
index b8b4960b6b2..364b5bf76aa 100644 |
| 21 |
--- a/media-gfx/exiv2/Manifest |
| 22 |
+++ b/media-gfx/exiv2/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
-DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 |
| 25 |
DIST exiv2-0.27.0a-Source.tar.gz 27168207 BLAKE2B 3f5c4fbe4f41c1114c0a54433c810ed0fb28ae3fbe8258eb7a02da716b833d62a94725f839accf22600c420ace5cdbead599440d335ff694a4f123820613ecd9 SHA512 9873d6815c2a87b7cdc49e8863f72c713fe1054f2f46d2c9aaa7ca2cd42096a36c2970e6a396af9000faba32fa9ff054b9d2c5e22f3e2624669440e553239f9c |
| 26 |
|
| 27 |
diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild |
| 28 |
deleted file mode 100644 |
| 29 |
index bce9baadb49..00000000000 |
| 30 |
--- a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,123 +0,0 @@ |
| 33 |
-# Copyright 1999-2018 Gentoo Authors |
| 34 |
-# Distributed under the terms of the GNU General Public License v2 |
| 35 |
- |
| 36 |
-EAPI=6 |
| 37 |
- |
| 38 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 39 |
-inherit cmake-multilib python-any-r1 |
| 40 |
- |
| 41 |
-DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" |
| 42 |
-HOMEPAGE="http://www.exiv2.org/" |
| 43 |
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz" |
| 44 |
- |
| 45 |
-LICENSE="GPL-2" |
| 46 |
-SLOT="0/26" |
| 47 |
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" |
| 48 |
-IUSE="doc examples nls png webready xmp" |
| 49 |
- |
| 50 |
-RDEPEND=" |
| 51 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
| 52 |
- nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
| 53 |
- png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 54 |
- webready? ( |
| 55 |
- net-libs/libssh[${MULTILIB_USEDEP}] |
| 56 |
- net-misc/curl[${MULTILIB_USEDEP}] |
| 57 |
- ) |
| 58 |
- xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) |
| 59 |
-" |
| 60 |
-DEPEND="${RDEPEND} |
| 61 |
- doc? ( |
| 62 |
- ${PYTHON_DEPS} |
| 63 |
- app-doc/doxygen |
| 64 |
- dev-libs/libxslt |
| 65 |
- media-gfx/graphviz |
| 66 |
- virtual/pkgconfig |
| 67 |
- ) |
| 68 |
- nls? ( sys-devel/gettext ) |
| 69 |
-" |
| 70 |
- |
| 71 |
-DOCS=( README doc/ChangeLog doc/cmd.txt ) |
| 72 |
- |
| 73 |
-PATCHES=( |
| 74 |
- # TODO: Take to upstream |
| 75 |
- "${FILESDIR}"/${PN}-0.26-fix-docs.patch |
| 76 |
- "${FILESDIR}"/${PN}-0.26-tools-optional.patch |
| 77 |
-) |
| 78 |
- |
| 79 |
-pkg_setup() { |
| 80 |
- use doc && python-any-r1_pkg_setup |
| 81 |
-} |
| 82 |
- |
| 83 |
-src_prepare() { |
| 84 |
- if [[ ${PV} != *9999 ]] ; then |
| 85 |
- if [[ -d po ]] ; then |
| 86 |
- pushd po > /dev/null || die |
| 87 |
- local lang |
| 88 |
- for lang in *.po; do |
| 89 |
- if [[ -e ${lang} ]] \ |
| 90 |
- && ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then |
| 91 |
- case ${lang} in |
| 92 |
- CMakeLists.txt | \ |
| 93 |
- ${PN}.pot) ;; |
| 94 |
- *) rm -r ${lang} || die ;; |
| 95 |
- esac |
| 96 |
- fi |
| 97 |
- done |
| 98 |
- popd > /dev/null || die |
| 99 |
- else |
| 100 |
- die "Failed to prepare LINGUAS - po directory moved?" |
| 101 |
- fi |
| 102 |
- fi |
| 103 |
- |
| 104 |
- # FIXME @upstream: |
| 105 |
- einfo "Converting doc/cmd.txt to UTF-8" |
| 106 |
- iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die |
| 107 |
- mv -f doc/cmd.txt.tmp doc/cmd.txt || die |
| 108 |
- |
| 109 |
- if use doc; then |
| 110 |
- einfo "Updating doxygen config" |
| 111 |
- doxygen &>/dev/null -u config/Doxyfile || die |
| 112 |
- fi |
| 113 |
- |
| 114 |
- edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch |
| 115 |
- |
| 116 |
- cmake-utils_src_prepare |
| 117 |
-} |
| 118 |
- |
| 119 |
-multilib_src_configure() { |
| 120 |
- local mycmakeargs=( |
| 121 |
- -DEXIV2_ENABLE_BUILD_SAMPLES=NO |
| 122 |
- -DEXIV2_ENABLE_BUILD_PO=$(usex nls) |
| 123 |
- -DEXIV2_ENABLE_NLS=$(usex nls) |
| 124 |
- -DEXIV2_ENABLE_PNG=$(usex png) |
| 125 |
- -DEXIV2_ENABLE_CURL=$(usex webready) |
| 126 |
- -DEXIV2_ENABLE_SSH=$(usex webready) |
| 127 |
- -DEXIV2_ENABLE_WEBREADY=$(usex webready) |
| 128 |
- -DEXIV2_ENABLE_XMP=$(usex xmp) |
| 129 |
- -DEXIV2_ENABLE_LIBXMP=NO |
| 130 |
- $(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO) |
| 131 |
- ) |
| 132 |
- |
| 133 |
- cmake-utils_src_configure |
| 134 |
-} |
| 135 |
- |
| 136 |
-multilib_src_compile() { |
| 137 |
- cmake-utils_src_compile |
| 138 |
- |
| 139 |
- if multilib_is_native_abi; then |
| 140 |
- use doc && emake -j1 doc |
| 141 |
- fi |
| 142 |
-} |
| 143 |
- |
| 144 |
-multilib_src_install_all() { |
| 145 |
- use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) |
| 146 |
- use doc && HTML_DOCS=( "${S}"/doc/html/. ) |
| 147 |
- |
| 148 |
- einstalldocs |
| 149 |
- find "${D}" -name '*.la' -delete || die |
| 150 |
- |
| 151 |
- if use examples; then |
| 152 |
- docinto examples |
| 153 |
- dodoc samples/*.cpp |
| 154 |
- fi |
| 155 |
-} |
| 156 |
|
| 157 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch b/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch |
| 158 |
deleted file mode 100644 |
| 159 |
index 05ea18d6eb0..00000000000 |
| 160 |
--- a/media-gfx/exiv2/files/exiv2-0.26-fix-docs.patch |
| 161 |
+++ /dev/null |
| 162 |
@@ -1,83 +0,0 @@ |
| 163 |
---- a/CMakeLists.txt 2015-07-19 16:04:35.363628707 +0200 |
| 164 |
-+++ b/CMakeLists.txt 2015-07-19 16:28:31.051680136 +0200 |
| 165 |
-@@ -216,9 +216,7 @@ |
| 166 |
- ADD_SUBDIRECTORY( xmpsdk ) |
| 167 |
- ADD_SUBDIRECTORY( src ) |
| 168 |
- |
| 169 |
--IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 170 |
-- ADD_SUBDIRECTORY( samples ) |
| 171 |
--ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 172 |
-+ADD_SUBDIRECTORY( samples ) |
| 173 |
- |
| 174 |
- IF( EXIV2_ENABLE_BUILD_PO ) |
| 175 |
- ADD_SUBDIRECTORY( po ) |
| 176 |
---- a/samples/CMakeLists.txt 2015-07-19 16:04:35.360628744 +0200 |
| 177 |
-+++ b/samples/CMakeLists.txt 2015-07-19 16:30:46.415987850 +0200 |
| 178 |
-@@ -21,6 +21,10 @@ |
| 179 |
- include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src") |
| 180 |
- |
| 181 |
--SET( SAMPLES addmoddel.cpp |
| 182 |
-+SET( SAMPLES taglist.cpp ) |
| 183 |
-+ |
| 184 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 185 |
-+ SET( SAMPLES ${SAMPLES} |
| 186 |
-+ addmoddel.cpp |
| 187 |
- convert-test.cpp |
| 188 |
- easyaccess-test.cpp |
| 189 |
- exifcomment.cpp |
| 190 |
-@@ -38,7 +42,6 @@ |
| 191 |
- mmap-test.cpp |
| 192 |
- prevtest.cpp |
| 193 |
- stringto-test.cpp |
| 194 |
-- taglist.cpp |
| 195 |
- tiff-test.cpp |
| 196 |
- werror-test.cpp |
| 197 |
- write-test.cpp |
| 198 |
-@@ -47,6 +50,7 @@ |
| 199 |
- xmpparser-test.cpp |
| 200 |
- xmpsample.cpp |
| 201 |
- ) |
| 202 |
-+ENDIF() |
| 203 |
- |
| 204 |
- FOREACH(entry ${SAMPLES}) |
| 205 |
- STRING( REPLACE ".cpp" "" target ${entry}) |
| 206 |
-@@ -63,6 +67,7 @@ |
| 207 |
- SET( MC_SRC ${MC_SRC} ../src/getopt_win32.c ) |
| 208 |
- ENDIF( MSVC ) |
| 209 |
- |
| 210 |
-+IF( EXIV2_ENABLE_BUILD_SAMPLES ) |
| 211 |
- SET( MC_SRC ${MC_SRC} metacopy.cpp ../src/utils.cpp ) |
| 212 |
- ADD_EXECUTABLE( metacopy ${MC_SRC} ) |
| 213 |
- TARGET_LINK_LIBRARIES( metacopy exiv2lib ) |
| 214 |
-@@ -79,6 +84,7 @@ |
| 215 |
- # ****************************************************************************** |
| 216 |
- # Man page |
| 217 |
- INSTALL( FILES exiv2samples.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 ) |
| 218 |
-+ENDIF() |
| 219 |
- |
| 220 |
- # That's all Folks! |
| 221 |
- ## |
| 222 |
---- a/doc/templates/Makefile 2015-07-19 16:50:50.589933604 +0200 |
| 223 |
-+++ b/doc/templates/Makefile 2015-07-19 16:51:07.686719864 +0200 |
| 224 |
-@@ -143,7 +143,7 @@ |
| 225 |
- xmp_mwg-rs \ |
| 226 |
- xmp_mwg-kw |
| 227 |
- |
| 228 |
--TAGLIST = ../../bin/taglist |
| 229 |
-+TAGLIST = ../../src/bin/taglist |
| 230 |
- |
| 231 |
- # ********************************************************************** |
| 232 |
- # ====================================================================== |
| 233 |
-diff --git a/doc/cmake_doc.sh b/doc/cmake_doc.sh |
| 234 |
-index 44dd6760..5910a86d 100755 |
| 235 |
---- a/doc/cmake_doc.sh |
| 236 |
-+++ b/doc/cmake_doc.sh |
| 237 |
-@@ -16,7 +16,7 @@ if [ $# == 1 ]; then |
| 238 |
- mv src/exv_conf.h.keep src/exv_conf.h |
| 239 |
- fi |
| 240 |
- mkdir -p src/bin/ |
| 241 |
-- cp -f "${CMAKE_BINARY_DIR}/bin/taglist" src/bin/ |
| 242 |
-+ cp -f "${CMAKE_BINARY_DIR}/samples/taglist" src/bin/ |
| 243 |
- make doc |
| 244 |
- fi |
| 245 |
- |
| 246 |
|
| 247 |
diff --git a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch b/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch |
| 248 |
deleted file mode 100644 |
| 249 |
index 686b37ff8b6..00000000000 |
| 250 |
--- a/media-gfx/exiv2/files/exiv2-0.26-tools-optional.patch |
| 251 |
+++ /dev/null |
| 252 |
@@ -1,28 +0,0 @@ |
| 253 |
---- a/CMakeLists.txt 2017-06-07 00:14:25.374608170 +0200 |
| 254 |
-+++ b/CMakeLists.txt 2017-06-07 00:17:00.680483299 +0200 |
| 255 |
-@@ -60,6 +60,7 @@ |
| 256 |
- OPTION( EXIV2_ENABLE_SSH "USE Libssh for SshIo" ON ) |
| 257 |
- SET ( EXIV2_ENABLE_DYNAMIC_RUNTIME OFF ) |
| 258 |
- ENDIF() |
| 259 |
-+OPTION( EXIV2_ENABLE_TOOLS "Build exiv2 executable" ON ) |
| 260 |
- |
| 261 |
- # set include path for FindXXX.cmake files |
| 262 |
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") |
| 263 |
---- a/src/CMakeLists.txt 2017-06-07 00:14:25.368608098 +0200 |
| 264 |
-+++ b/src/CMakeLists.txt 2017-06-07 00:16:06.710831682 +0200 |
| 265 |
-@@ -317,10 +317,12 @@ |
| 266 |
- |
| 267 |
- # ****************************************************************************** |
| 268 |
- # exiv2 application |
| 269 |
--ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) |
| 270 |
-+IF(EXIV2_ENABLE_TOOLS) |
| 271 |
-+ ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) |
| 272 |
- target_compile_definitions(exiv2 PRIVATE EXV_LOCALEDIR="${CMAKE_INSTALL_LOCALEDIR}" ) |
| 273 |
--TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) |
| 274 |
--INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 275 |
-+ TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} ) |
| 276 |
-+ INSTALL( TARGETS exiv2 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |
| 277 |
-+ENDIF( EXIV2_ENABLE_TOOLS ) |
| 278 |
- |
| 279 |
- # ****************************************************************************** |
| 280 |
- # connection test application |
Archives