diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-08 20:11:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-08 20:11:47 +0100 |
| commit | f625b9919a60a30f1bd860f7d1b2eac183ced593 (patch) | |
| tree | 7543f00925ff7277e31881de0a87801681f6f92f /media-gfx/exiv2 | |
| parent | e3872864be25f7421015bef2732fa57c0c9fb726 (diff) | |
gentoo resync : 08.08.2018
Diffstat (limited to 'media-gfx/exiv2')
| -rw-r--r-- | media-gfx/exiv2/Manifest | 3 | ||||
| -rw-r--r-- | media-gfx/exiv2/exiv2-0.26_p20180319.ebuild | 3 | ||||
| -rw-r--r-- | media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch | 47 |
3 files changed, 51 insertions, 2 deletions
diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 6acdc4485177..726f4736cb1c 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -2,6 +2,7 @@ AUX exiv2-0.26-fix-docs.patch 2532 BLAKE2B c648454a7c9a56c2d4a3844cbe212630ff6c3 AUX exiv2-0.26-tools-optional.patch 1386 BLAKE2B 84e0903934187aaa914c0a4fe04afe63ed3314ea76d6929b7435899a731bb90831418b2162e1dca4a487b88041fe7b9aa50a3c438e66ac3893dd1d12b363714f SHA512 efdd848dd728fcb0ba5dbc305fef6eb6af4385b5bd09e2c3722c0dea2009207c282b95a07cdb608fc2298d18686c764dded2fd9de4166dbecabf7eeb187e6483 AUX exiv2-0.26_p20180319-CVE-2017-18005.patch 17451 BLAKE2B 8003fa352503d287f5f96572196cd67f4de8d90fda221588f77bdd2d053407f1e1dceba6aab317fc5a003aa5b6f0d99336f4a8e4fb21696b5d20b81a3d4af29f SHA512 94ed0a17a7ca9bd1155fc4c67ca67bf59dafedf5570cf4d7e59bda6f4b4c0749d98fd1c2d8929612a2fe5840565ce070acf21ac68d9d6882fe5c0a98ee18b343 AUX exiv2-0.26_p20180319-CVE-2018-4868.patch 1694 BLAKE2B c288075acac8c2335da2b04cac24ac7b3a414e05d04a1e951cdbd3d90997756fa5c1dae5d2b193583e529a7eacc0cbb88d5c8345c3be76798d1897af7a7f250d SHA512 7506ccc0914dc78e369129efb0736638ee7a4ebf98d76feed0ce6a7c9d2885f5f7c984376df288f0694ec05654b89c39be42a989bcedd64d0fcecd6c605fe601 +AUX exiv2-0.26_p20180319-clang-fix.patch 1793 BLAKE2B 7312324ed80314e28dfdf4066247d64db89928cdf09b186b200efc071d5dd6630e3a22d7ed10f312ccbcace291f6e3a17fdce8bd42d4e094e6c07d85ee42d45b SHA512 54c96c831aabfaca93bfb2fee4b13a080be6bbad4b634890d26e42c6a069571277f75bbc517c0e212e99fc12add77d12fbaa0652e2a1506ac94e2e8c043901ed DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1 -EBUILD exiv2-0.26_p20180319.ebuild 3308 BLAKE2B 609ff16f1e63a841ffcbd72b5ecfb31f67c83c44dd1bc26807f68a312efe6d931dfd4390db7f61c10f0c27bfe8badd399e9f4131769aeb98b118124c1f292e92 SHA512 1d7b08a55cb9fd57f9d73ad7b72b59c851046109372c4575d260c703153cda44cf4f84ca08e58558b51deb73ad1736a7622f4306ff575abc73fb2cf682ab6d92 +EBUILD exiv2-0.26_p20180319.ebuild 3321 BLAKE2B 5a4bfe2aa47b7793ae10a39f428422c4aeed62805ab9b7f0c26a0af2c682968941ff9910c5d12eaf50093df593198e0b9bf8f22b194777ce3c79117b390cce81 SHA512 c4a200f82432e06727aef721384a994953ce3adadcfd315ad765927e75ec9f4422c31b98f6b7bd3c9660b31edd551a2c675f90d57d04491441ffb1524171422e MISC metadata.xml 612 BLAKE2B f98a074e9e3a4411baf8255cd8cab5be4257469463634218b664bb9e7f159c98615f0721bb4463c6183cecc8b2be00c34a031e7b99d745b9807634cbaab8d479 SHA512 9b4926ba8420a125dc4cefd351ee1ec10a4df2fc4306a56720f6e8de7c5fd9f36a8646c8583958fca9a45ebe1b65b19c053c7da37176546bc19ae64afa87e4f5 diff --git a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild index 478ea7a79b15..eb2572dfcf35 100644 --- a/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild +++ b/media-gfx/exiv2/exiv2-0.26_p20180319.ebuild @@ -48,9 +48,10 @@ DOCS=( README doc/ChangeLog doc/cmd.txt ) S="${WORKDIR}/${PN^}-${PN}-${COMMIT:0:7}" PATCHES=( - # master, pending backports for 0.26 + # 0.26 branch "${FILESDIR}"/${P}-CVE-2018-4868.patch "${FILESDIR}"/${P}-CVE-2017-18005.patch + "${FILESDIR}"/${P}-clang-fix.patch # TODO: Take to upstream "${FILESDIR}"/${PN}-0.26-fix-docs.patch "${FILESDIR}"/${PN}-0.26-tools-optional.patch diff --git a/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch new file mode 100644 index 000000000000..a80543a5ecd7 --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.26_p20180319-clang-fix.patch @@ -0,0 +1,47 @@ +From 176ba44cc31064183fdfbce55a7dd7e6b5e2a962 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dan.cermak@cgc-instruments.com> +Date: Fri, 8 Jun 2018 23:46:04 +0200 +Subject: [PATCH] Fix C & C++ flag adding in CMakeLists.txt + +--- + CMakeLists.txt | 22 ++++++++++++---------- + 1 file changed, 12 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e179bf5..98a172ed 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,21 +74,23 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") + + if( MINGW OR UNIX ) + if (${CMAKE_CXX_COMPILER_ID} STREQUAL GNU) +- ADD_DEFINITIONS(-Wall +- -Wcast-align +- -Wpointer-arith +- -Wformat-security +- -Wmissing-format-attribute +- -Woverloaded-virtual +- -W +- ) ++ string(CONCAT WARNING_FLAGS " -Wall" ++ " -Wcast-align" ++ " -Wpointer-arith" ++ " -Wformat-security" ++ " -Wmissing-format-attribute" ++ " -Woverloaded-virtual" ++ " -W" ++ ) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}") + ENDIF() + + message(STATUS "Compiler info: ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER}) ; version: ${CMAKE_CXX_COMPILER_VERSION}") + IF ( CYGWIN OR (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0)) +- ADD_DEFINITIONS( -std=gnu++98 ) # to support snprintf ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98" ) # to support snprintf + ELSE() +- ADD_DEFINITIONS( -std=c++98 ) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98" ) + ENDIF() + + ENDIF( MINGW OR UNIX )
\ No newline at end of file |