Removing insecure versions. Bumping 0.6 version to fix bug #86740 where a pointer was incremented instead of the number it pointed to.

Package-Manager: portage-2.0.51.19

9 files changed, 37 insertions, 105 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index a55257749341..90a9abc3d35b 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.33 2005/04/05 02:53:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.34 2005/04/16 18:52:39 eradicator Exp $
+
+*libexif-0.6.12-r3 (16 Apr 2005)
+
+  16 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libexif-0.6.12-86740.patch, -libexif-0.5.12-r1.ebuild,
+  -libexif-0.6.10-r1.ebuild, -libexif-0.6.12-r2.ebuild,
+  +libexif-0.6.12-r3.ebuild:
+  Removing insecure versions. Bumping 0.6 version to fix bug #86740 where a
+  pointer was incremented instead of the number it pointed to.
 
 *libexif-0.6.12-r2 (05 Apr 2005)
 
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index c24de314c50e..4759d7f116fc 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f0a5d5ef2dc205a9116afa4f929ccfb1 ChangeLog 4513
-MD5 7a7e0eb14d617dc5172910756fbf2c5a libexif-0.5.12-r1.ebuild 1041
-MD5 ba266a4724bc035ea4b034b0ca592658 libexif-0.6.10-r1.ebuild 1180
+MD5 b81c723b51acb62821e3959a6b401603 ChangeLog 4893
 MD5 a75e1a14e52213457be999a46c9392ed libexif-0.5.12-r2.ebuild 1125
-MD5 f529fe0ec59fd56244a33c984eb8a92b libexif-0.6.12-r2.ebuild 1512
-MD5 c6e7ee4006cd2b5bd7cb0367f816fc8a files/digest-libexif-0.5.12-r1 66
+MD5 6bd478cbaa71caa506a919e7ac85f7fd libexif-0.6.12-r3.ebuild 1559
 MD5 c6e7ee4006cd2b5bd7cb0367f816fc8a files/digest-libexif-0.5.12-r2 66
 MD5 656d5fb19cf1cdef7132ccb6fa72db2b files/libexif-0.6-CAN-2005-0664.patch 833
 MD5 a8085215f21d54708b3bfca3e1aeb612 files/libexif-0.5-CAN-2005-0664.patch 860
-MD5 0847d4ce556a73514f3fbbf303707e07 files/digest-libexif-0.6.12-r2 66
-MD5 5356148028342869b259b39e10195fd5 files/digest-libexif-0.6.10-r1 66
+MD5 0847d4ce556a73514f3fbbf303707e07 files/digest-libexif-0.6.12-r3 66
+MD5 a218f0d3896c793cf66fc505f743ef3b files/libexif-0.6.12-86740.patch 627
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCUf3JArHZZzCEUG0RAskwAKCDY4qRQ4opLn0nHEzf0LnCYLEJ5gCfU5cI
-MDZJE3vViMYFf+HGcWDF6EE=
-=ziNe
+iD8DBQFCYV8QArHZZzCEUG0RAm6hAKCKcTHGwm0UR0w/9Qncci1o67DqaACeM+tc
+WTBo09fnntp+IHf1biVoD4E=
+=Pvbk
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libexif/files/digest-libexif-0.5.12-r1 b/media-libs/libexif/files/digest-libexif-0.5.12-r1
deleted file mode 100644
index 83a5d8ba424e..000000000000
--- a/media-libs/libexif/files/digest-libexif-0.5.12-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 97e17fa05cb638eed5e8e59db431ed3a libexif-0.5.12.tar.gz 443724
diff --git a/media-libs/libexif/files/digest-libexif-0.6.10-r1 b/media-libs/libexif/files/digest-libexif-0.6.10-r1
deleted file mode 100644
index 434d4f40b19b..000000000000
--- a/media-libs/libexif/files/digest-libexif-0.6.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f8a7cf1f083628b78a07dca17cbc6b8b libexif-0.6.10.tar.gz 516861
diff --git a/media-libs/libexif/files/digest-libexif-0.6.12-r2 b/media-libs/libexif/files/digest-libexif-0.6.12-r3
index 09504fee0be0..09504fee0be0 100644
--- a/media-libs/libexif/files/digest-libexif-0.6.12-r2
+++ b/media-libs/libexif/files/digest-libexif-0.6.12-r3
diff --git a/media-libs/libexif/files/libexif-0.6.12-86740.patch b/media-libs/libexif/files/libexif-0.6.12-86740.patch
new file mode 100644
index 000000000000..ae272a479221
--- /dev/null
+++ b/media-libs/libexif/files/libexif-0.6.12-86740.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvsroot/libexif/libexif/libexif/exif-data.c,v
+retrieving revision 1.67
+retrieving revision 1.68
+diff -u -r1.67 -r1.68
+--- libexif/libexif/libexif/exif-data.c	2005/03/09 22:11:48	1.67
++++ libexif/libexif/libexif/exif-data.c	2005/03/13 19:56:13	1.68
+@@ -231,7 +231,7 @@
+ 		 * the offset must be an even number. If we need to introduce
+ 		 * a padding byte, we set it to 0.
+ 		 */
+-		if (s & 1) *ds++;
++		if (s & 1) (*ds)++;
+ 		*d = exif_mem_realloc (data->priv->mem, *d, *ds);
+ 		if (!*d) {
+ 			EXIF_LOG_NO_MEMORY (data->priv->log, "ExifData", *ds);
diff --git a/media-libs/libexif/libexif-0.5.12-r1.ebuild b/media-libs/libexif/libexif-0.5.12-r1.ebuild
deleted file mode 100644
index eb4529e960cb..000000000000
--- a/media-libs/libexif/libexif-0.5.12-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.12-r1.ebuild,v 1.12 2005/02/24 16:10:48 j4rg0n Exp $
-
-inherit eutils
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 ppc-macos sparc x86"
-IUSE="nls"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND="virtual/libc"
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/include/libexif
-	dodir /usr/share/locale
-	dodir /usr/$(get_libdir)/pkgconfig
-	einstall || die
-
-	dodoc ChangeLog README
-
-	# installs a blank directory for whatever broken reason
-	use nls || rmdir ${D}/usr/share/locale
-}
-
-pkg_postinst() {
-	einfo
-	einfo "if you've upgraded from ${PN}-0.5.8 you'll"
-	einfo "have to run revdep-rebuild from gentoolkit"
-	einfo
-}
diff --git a/media-libs/libexif/libexif-0.6.10-r1.ebuild b/media-libs/libexif/libexif-0.6.10-r1.ebuild
deleted file mode 100644
index ef2ada78da45..000000000000
--- a/media-libs/libexif/libexif-0.6.10-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.10-r1.ebuild,v 1.2 2005/03/12 20:45:50 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Library for parsing, editing, and saving EXIF data"
-HOMEPAGE="http://libexif.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~sparc ~x86"
-IUSE="nls"
-
-DEPEND="dev-util/pkgconfig"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/libexif-0.6-CAN-2005-0664.patch
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/include/libexif
-	use nls && dodir /usr/share/locale
-	dodir /usr/$(get_libdir)/pkgconfig
-
-	make DESTDIR="${D}" install || die
-
-	dodoc ChangeLog README
-
-	# installs a blank directory for whatever broken reason
-	use nls || rm -rf ${D}/usr/share/locale
-
-	# Keep around old lib
-	preserve_old_lib /usr/$(get_libdir)/libexif.so.9
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify /usr/$(get_libdir)/libexif.so.9
-}
diff --git a/media-libs/libexif/libexif-0.6.12-r2.ebuild b/media-libs/libexif/libexif-0.6.12-r3.ebuild
index c51066fd555d..a353da20b9a8 100644
--- a/media-libs/libexif/libexif-0.6.12-r2.ebuild
+++ b/media-libs/libexif/libexif-0.6.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.12-r2.ebuild,v 1.1 2005/04/05 02:53:32 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.12-r3.ebuild,v 1.1 2005/04/16 18:52:39 eradicator Exp $
 
 inherit eutils
 
@@ -19,6 +19,9 @@ RDEPEND=""
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+	epatch ${FILESDIR}/${P}-86740.patch
+
 	# The libexif hackers made a goof on the soname versioning.  It will
 	# be fixed in 0.6.13 at which point LIBEXIF_AGE should be removed here.
 	sed -i 's/^LIBEXIF_AGE=0$/LIBEXIF_AGE=2/' ${S}/configure