summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Briesenick <sbriesen@gentoo.org>2008-09-01 17:13:36 +0000
committerStefan Briesenick <sbriesen@gentoo.org>2008-09-01 17:13:36 +0000
commitc369ee2e7bb289a76e571366db1a541fb97aba75 (patch)
tree9177079f35c4c84ab670956025cf7a61289b56dd /media-gfx
parentold (diff)
downloadgentoo-2-c369ee2e7bb289a76e571366db1a541fb97aba75.tar.gz
gentoo-2-c369ee2e7bb289a76e571366db1a541fb97aba75.tar.bz2
gentoo-2-c369ee2e7bb289a76e571366db1a541fb97aba75.zip
removed old versions
(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/exiv2/ChangeLog7
-rw-r--r--media-gfx/exiv2/exiv2-0.15-r1.ebuild72
-rw-r--r--media-gfx/exiv2/exiv2-0.16-r1.ebuild78
-rw-r--r--media-gfx/exiv2/exiv2-0.16.ebuild75
-rw-r--r--media-gfx/exiv2/files/CVE-2007-6353.diff89
-rw-r--r--media-gfx/exiv2/files/exiv2-0.16-gcc43.diff50
6 files changed, 6 insertions, 365 deletions
diff --git a/media-gfx/exiv2/ChangeLog b/media-gfx/exiv2/ChangeLog
index 1d64034f98dc..2c92867e5230 100644
--- a/media-gfx/exiv2/ChangeLog
+++ b/media-gfx/exiv2/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/exiv2
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.52 2008/08/22 21:39:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/ChangeLog,v 1.53 2008/09/01 17:13:35 sbriesen Exp $
+
+ 01 Sep 2008; Stefan Briesenick <sbriesen@gentoo.org>
+ -files/exiv2-0.16-gcc43.diff, -files/CVE-2007-6353.diff,
+ -exiv2-0.15-r1.ebuild, -exiv2-0.16.ebuild, -exiv2-0.16-r1.ebuild:
+ removed old versions
22 Aug 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
diff --git a/media-gfx/exiv2/exiv2-0.15-r1.ebuild b/media-gfx/exiv2/exiv2-0.15-r1.ebuild
deleted file mode 100644
index a22019ddf67a..000000000000
--- a/media-gfx/exiv2/exiv2-0.15-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.15-r1.ebuild,v 1.4 2008/02/10 01:08:33 philantrop Exp $
-
-inherit eutils
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-
-IUSE="doc nls zlib unicode"
-IUSE_LINGUAS="de es fi fr pl ru"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-RDEPEND="zlib? ( sys-libs/zlib )
- nls? ( virtual/libintl )
- virtual/libiconv"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # see bug #202351
- epatch "${FILESDIR}/CVE-2007-6353.diff"
-
- if use unicode; then
- for i in doc/cmd.txt; do
- echo ">>> Converting "${i}" to UTF-8"
- iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- done
- fi
-
- if use doc; then
- echo ">>> Updating doxygen config"
- doxygen &>/dev/null -u config/Doxyfile
- fi
-}
-
-src_compile() {
- local myconf="$(use_enable nls)"
- use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake doc failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README doc/{ChangeLog,cmd.txt}
- use doc && dohtml -r doc/html/.
-}
-
-pkg_postinst() {
- ewarn
- ewarn "PLEASE PLEASE take note of this:"
- ewarn "Please make *sure* to run revdep-rebuild now"
- ewarn "Certain things on your system may have linked against a"
- ewarn "different version of exiv2 -- those things need to be"
- ewarn "recompiled. Sorry for the inconvenience!"
- ewarn
-}
diff --git a/media-gfx/exiv2/exiv2-0.16-r1.ebuild b/media-gfx/exiv2/exiv2-0.16-r1.ebuild
deleted file mode 100644
index 893e07fda4f7..000000000000
--- a/media-gfx/exiv2/exiv2-0.16-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.16-r1.ebuild,v 1.1 2008/03/26 23:49:00 sbriesen Exp $
-
-inherit eutils
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="doc nls zlib xmp examples unicode"
-IUSE_LINGUAS="de es fi fr pl ru"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-RDEPEND="zlib? ( sys-libs/zlib )
- xmp? ( dev-libs/expat )
- nls? ( virtual/libintl )
- virtual/libiconv"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- # gcc 4.3 patch (see bug #214814)
- epatch "${FILESDIR}/${P}-gcc43.diff"
-
- if use unicode; then
- for i in doc/cmd.txt; do
- echo ">>> Converting "${i}" to UTF-8"
- iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- done
- fi
-
- if use doc; then
- echo ">>> Updating doxygen config"
- doxygen &>/dev/null -u config/Doxyfile
- fi
-}
-
-src_compile() {
- local myconf="$(use_enable nls) $(use_enable xmp)"
- use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake doc failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README doc/{ChangeLog,cmd.txt}
- use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
- use doc && dohtml -r doc/html/.
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins samples/*.cpp
- fi
-}
-
-pkg_postinst() {
- ewarn
- ewarn "PLEASE PLEASE take note of this:"
- ewarn "Please make *sure* to run revdep-rebuild now"
- ewarn "Certain things on your system may have linked against a"
- ewarn "different version of exiv2 -- those things need to be"
- ewarn "recompiled. Sorry for the inconvenience!"
- ewarn
-}
diff --git a/media-gfx/exiv2/exiv2-0.16.ebuild b/media-gfx/exiv2/exiv2-0.16.ebuild
deleted file mode 100644
index 01a9658b239e..000000000000
--- a/media-gfx/exiv2/exiv2-0.16.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exiv2/exiv2-0.16.ebuild,v 1.3 2008/01/29 20:38:59 nixnut Exp $
-
-inherit eutils
-
-DESCRIPTION="EXIF and IPTC metadata C++ library and command line utility"
-HOMEPAGE="http://www.exiv2.org/"
-SRC_URI="http://www.exiv2.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
-
-IUSE="doc nls zlib xmp examples unicode"
-IUSE_LINGUAS="de es fi fr pl ru"
-
-for X in ${IUSE_LINGUAS}; do IUSE="${IUSE} linguas_${X}"; done
-
-RDEPEND="zlib? ( sys-libs/zlib )
- xmp? ( dev-libs/expat )
- nls? ( virtual/libintl )
- virtual/libiconv"
-
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( sys-devel/gettext )"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- if use unicode; then
- for i in doc/cmd.txt; do
- echo ">>> Converting "${i}" to UTF-8"
- iconv -f LATIN1 -t UTF-8 "${i}" > "${i}~" && mv -f "${i}~" "${i}" || rm -f "${i}~"
- done
- fi
-
- if use doc; then
- echo ">>> Updating doxygen config"
- doxygen &>/dev/null -u config/Doxyfile
- fi
-}
-
-src_compile() {
- local myconf="$(use_enable nls) $(use_enable xmp)"
- use zlib || myconf="${myconf} --without-zlib" # plain 'use_with' fails
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
- if use doc; then
- emake doc || die "emake doc failed"
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc README doc/{ChangeLog,cmd.txt}
- use xmp && dodoc doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt}
- use doc && dohtml -r doc/html/.
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins samples/*.cpp
- fi
-}
-
-pkg_postinst() {
- ewarn
- ewarn "PLEASE PLEASE take note of this:"
- ewarn "Please make *sure* to run revdep-rebuild now"
- ewarn "Certain things on your system may have linked against a"
- ewarn "different version of exiv2 -- those things need to be"
- ewarn "recompiled. Sorry for the inconvenience!"
- ewarn
-}
diff --git a/media-gfx/exiv2/files/CVE-2007-6353.diff b/media-gfx/exiv2/files/CVE-2007-6353.diff
deleted file mode 100644
index 13b7fe9ac312..000000000000
--- a/media-gfx/exiv2/files/CVE-2007-6353.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-Index: exiv2-0.13/src/exif.cpp
-===================================================================
---- exiv2-0.13.orig/src/exif.cpp
-+++ exiv2-0.13/src/exif.cpp
-@@ -215,10 +215,12 @@ namespace Exiv2 {
- ExifData::const_iterator sizes;
- ExifKey key("Exif.Thumbnail.StripByteCounts");
- sizes = exifData.findKey(key);
-- if (sizes == exifData.end()) return 2;
-+ if (sizes == exifData.end()) return 1;
-
-- long totalSize = 0;
-+ uint32_t totalSize = 0;
- for (long i = 0; i < sizes->count(); ++i) {
-+ uint32_t size = sizes->toLong(i);
-+ if (size > 0xffffffff - totalSize) return 1;
- totalSize += sizes->toLong(i);
- }
- DataBuf stripsBuf(totalSize);
-@@ -228,21 +230,23 @@ namespace Exiv2 {
- ExifData::iterator stripOffsets;
- key = ExifKey("Exif.Thumbnail.StripOffsets");
- stripOffsets = exifData.findKey(key);
-- if (stripOffsets == exifData.end()) return 2;
-- if (stripOffsets->count() != sizes->count()) return 2;
-+ if (stripOffsets == exifData.end()) return 1;
-+ if (stripOffsets->count() != sizes->count()) return 1;
-
- std::ostringstream os; // for the strip offsets
-- long currentOffset = 0;
-- long firstOffset = stripOffsets->toLong(0);
-- long lastOffset = 0;
-- long lastSize = 0;
-+ uint32_t currentOffset = 0;
-+ uint32_t firstOffset = stripOffsets->toLong(0);
-+ uint32_t lastOffset = 0;
-+ uint32_t lastSize = 0;
- for (long i = 0; i < stripOffsets->count(); ++i) {
-- long offset = stripOffsets->toLong(i);
-+ uint32_t offset = stripOffsets->toLong(i);
- lastOffset = offset;
-- long size = sizes->toLong(i);
-+ uint32_t size = sizes->toLong(i);
- lastSize = size;
-- if (len < offset + size) return 1;
--
-+ if ( size > 0xffffffff - offset
-+ || static_cast<uint32_t>(len) < offset + size) {
-+ return 2;
-+ }
- memcpy(stripsBuf.pData_ + currentOffset, buf + offset, size);
- os << currentOffset << " ";
- currentOffset += size;
-@@ -303,12 +307,15 @@ namespace Exiv2 {
- ExifKey key("Exif.Thumbnail.JPEGInterchangeFormat");
- ExifData::iterator format = exifData.findKey(key);
- if (format == exifData.end()) return 1;
-- long offset = format->toLong();
-+ uint32_t offset = format->toLong();
- key = ExifKey("Exif.Thumbnail.JPEGInterchangeFormatLength");
- ExifData::const_iterator length = exifData.findKey(key);
- if (length == exifData.end()) return 1;
-- long size = length->toLong();
-- if (len < offset + size) return 2;
-+ uint32_t size = length->toLong();
-+ if ( size > 0xffffffff - offset
-+ || static_cast<uint32_t>(len) < offset + size) {
-+ return 2;
-+ }
- format->setDataArea(buf + offset, size);
- format->setValue("0");
- if (pIfd1) {
-@@ -595,8 +602,14 @@ namespace Exiv2 {
- if (pIopIfd_) add(pIopIfd_->begin(), pIopIfd_->end(), byteOrder());
- if (pGpsIfd_) add(pGpsIfd_->begin(), pGpsIfd_->end(), byteOrder());
- if (pIfd1_) add(pIfd1_->begin(), pIfd1_->end(), byteOrder());
-- // Read the thumbnail (but don't worry whether it was successful or not)
-- readThumbnail();
-+ // Finally, read the thumbnail
-+ rc = readThumbnail();
-+ if (0 < rc) {
-+#ifndef SUPPRESS_WARNINGS
-+ std::cerr << "Warning: Failed to read thumbnail, rc = "
-+ << rc << "\n";
-+#endif
-+ }
-
- return 0;
- } // ExifData::load
diff --git a/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff b/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff
deleted file mode 100644
index 2b8e251158a5..000000000000
--- a/media-gfx/exiv2/files/exiv2-0.16-gcc43.diff
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/src/basicio.cpp
-+++ b/src/basicio.cpp
-@@ -428,7 +428,7 @@
- // Minimum size for 1st block is 32kB
- long size = std::max(32768 * (1 + need / 32768), size_);
- byte* data = (byte*)std::malloc(size);
-- std::memcpy(data, data_, size_);
-+ memcpy(data, data_, size_);
- data_ = data;
- sizeAlloced_ = size;
- isMalloced_ = true;
---- a/xmpsdk/src/XMPCore_Impl.hpp
-+++ b/xmpsdk/src/XMPCore_Impl.hpp
-@@ -24,6 +24,7 @@
- #include <map>
-
- #include <cassert>
-+#include <cstring>
-
- #if XMP_MacBuild
- #include <Multiprocessing.h>
-@@ -89,7 +90,7 @@
- #define kHexDigits "0123456789ABCDEF"
-
- #define XMP_LitMatch(s,l) (std::strcmp((s),(l)) == 0)
--#define XMP_LitNMatch(s,l,n) (std::strncmp((s),(l),(n)) == 0)
-+#define XMP_LitNMatch(s,l,n) (strncmp((s),(l),(n)) == 0)
- // *** Use the above macros!
-
- #define kTab ((char)0x09)
-@@ -369,7 +370,7 @@
- IsPathPrefix ( XMP_StringPtr fullPath, XMP_StringPtr prefix )
- {
- bool isPrefix = false;
-- XMP_StringLen prefixLen = std::strlen(prefix);
-+ XMP_StringLen prefixLen = strlen(prefix);
- if ( XMP_LitNMatch ( prefix, fullPath, prefixLen ) ) {
- char separator = fullPath[prefixLen];
- if ( (separator == 0) || (separator == '/') ||
---- a/xmpsdk/src/XMPMeta.cpp
-+++ b/xmpsdk/src/XMPMeta.cpp
-@@ -20,6 +20,8 @@
- #include "UnicodeInlines.incl_cpp"
- #include "UnicodeConversions.hpp"
-
-+#include <cstring>
-+
- #if XMP_DebugBuild
- #include <iostream>
- #endif