From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F119138334 for ; Fri, 21 Sep 2018 14:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1301FE0867; Fri, 21 Sep 2018 14:51:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6F0DE0867 for ; Fri, 21 Sep 2018 14:51:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21F40335CD2 for ; Fri, 21 Sep 2018 14:50:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 789A83D5 for ; Fri, 21 Sep 2018 14:50:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1537541073.524916ca71deef81fd09c9514ade715d2b4acfaa.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/exiv2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/exiv2/Manifest media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild X-VCS-Directories: media-gfx/exiv2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 524916ca71deef81fd09c9514ade715d2b4acfaa X-VCS-Branch: master Date: Fri, 21 Sep 2018 14:50:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 69074efc-d0d0-4cbc-8785-325c1f42b15b X-Archives-Hash: 63bf9c5bdd3df3e6d8c5c09b9c5b24cb commit: 524916ca71deef81fd09c9514ade715d2b4acfaa Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 21 14:44:33 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 21 14:44:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524916ca media-gfx/exiv2: Tarball respun for CVE-2018-8976, CVE-2018-8977 Custom packed tarball based on upstream 0.26 branch as of 2018-08-11, with additional fixes from git master. Bug: https://bugs.gentoo.org/652822 Package-Manager: Portage-2.3.49, Repoman-2.3.10 media-gfx/exiv2/Manifest | 1 + media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild | 123 +++++++++++++++++++++++++ 2 files changed, 124 insertions(+) diff --git a/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 641ff1d2a48..08120977c2d 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1,3 +1,4 @@ DIST exiv2-0.26_p20180319.tar.gz 28383543 BLAKE2B 753a2ebdb2033490c0f66cb1fb2574f02125f17813f6cbaf5eca66e053af9a2cdbc1266f0a033f0706ec22b31acd6e87271e426a335a58ee947757b52d283489 SHA512 852ce2cffcc0a2d902a939933127fdf5fa0b50020e1faf3ab0a375b129b9f61c7b97b76d4f39e376e7288d7cc045867bd1a96ae15dd0b7c0bcd1ba15259628e1 DIST exiv2-0.26_p20180811b.tar.xz 1722288 BLAKE2B 30b34e75c23509924e41ccf21215c63dd91424a7c21bb530486edabf3c089ff27251073efe11223e983014536b80005bb44ef721d5bd0a50e04ea8d3b6732189 SHA512 252683a7da1073aac08b9745b4b2ce4a9d628828315ba5d0d72453184e74f34a6d1f22bd5291a6818008f394cd6bf8fc4d460d70a942e85db8c3fd6c3ca22f88 DIST exiv2-0.26_p20180811c.tar.xz 1723668 BLAKE2B 0bbba3d04ca063f62797ce5bd9a1a39f87c5ed26ed9eecb73fb11051660c761d2c56dec392d73d3a33573599efa95790d84d59b3c4da3122a1eb564f5978ef65 SHA512 4a7bc11805e204b541819f434defc48ff579b2c84c9504d6c7826a3808f73cda3d68f357a179f14a8277e6a338c3bb94c9e63da9f61a5ea3c548e0ad93df56ce +DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 diff --git a/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild new file mode 100644 index 00000000000..45bd4bba12c --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.26_p20180811-r3.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" +HOMEPAGE="http://www.exiv2.org/" +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}d.tar.xz" + +LICENSE="GPL-2" +SLOT="0/26" +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" +IUSE="doc examples nls png webready xmp" + +RDEPEND=" + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + png? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + webready? ( + net-libs/libssh[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + xmp? ( >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz + virtual/pkgconfig + ) + nls? ( sys-devel/gettext ) +" + +DOCS=( README doc/ChangeLog doc/cmd.txt ) + +PATCHES=( + # TODO: Take to upstream + "${FILESDIR}"/${PN}-0.26-fix-docs.patch + "${FILESDIR}"/${PN}-0.26-tools-optional.patch +) + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + if [[ ${PV} != *9999 ]] ; then + if [[ -d po ]] ; then + pushd po > /dev/null || die + local lang + for lang in *.po; do + if [[ -e ${lang} ]] \ + && ! has ${lang/.po/} ${LINGUAS-${lang/.po/}} ; then + case ${lang} in + CMakeLists.txt | \ + ${PN}.pot) ;; + *) rm -r ${lang} || die ;; + esac + fi + done + popd > /dev/null || die + else + die "Failed to prepare LINGUAS - po directory moved?" + fi + fi + + # 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 + + if use doc; then + einfo "Updating doxygen config" + doxygen &>/dev/null -u config/Doxyfile || die + fi + + edos2unix samples/exiv2json.cpp # workaround for CVE-2017-18005 patch + + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DEXIV2_ENABLE_BUILD_SAMPLES=NO + -DEXIV2_ENABLE_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) + -DEXIV2_ENABLE_LIBXMP=NO + $(multilib_is_native_abi || echo -DEXIV2_ENABLE_TOOLS=NO) + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + + if multilib_is_native_abi; then + use doc && emake -j1 doc + fi +} + +multilib_src_install_all() { + use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) + use doc && HTML_DOCS=( "${S}"/doc/html/. ) + + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc samples/*.cpp + fi +}