rpms/libexif/devel olympus-byte-order.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 libexif.spec, 1.36, 1.37 sources, 1.6, 1.7

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/libexif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29314

Modified Files:
	.cvsignore libexif.spec sources 
Added Files:
	olympus-byte-order.patch 
Log Message:
update to 0.6.16
fix #379561


olympus-byte-order.patch:

--- NEW FILE olympus-byte-order.patch ---
diff -up libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c.olympus-byte-order libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c
--- libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c.olympus-byte-order	2008-02-05 19:54:41.000000000 -0500
+++ libexif-0.6.15/libexif/olympus/exif-mnote-data-olympus.c	2008-02-05 19:59:28.000000000 -0500
@@ -230,6 +230,15 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		else if (buf[o2 + 6 + 1] == 1)
 			n->order = EXIF_BYTE_ORDER_MOTOROLA;
 		o2 += 8;
+		if (o2 >= buf_size) return;
+		c = exif_get_short (buf + o2, n->order);
+		if ((!(c & 0xFF)) && (c > 0x500)) {
+			if (n->order == EXIF_BYTE_ORDER_INTEL) {
+				n->order = EXIF_BYTE_ORDER_MOTOROLA;
+			} else {
+				n->order = EXIF_BYTE_ORDER_INTEL;
+			}
+		}
 
 	} else if (!memcmp (buf + o2, "OLYMPUS", 8)) {
 		/* Olympus S760, S770 */
@@ -267,6 +276,16 @@ exif_mnote_data_olympus_load (ExifMnoteD
 		case nikonV1:
 
 			base = MNOTE_NIKON1_TAG_BASE;
+			/* Fix endianness, if needed */
+			if (o2 >= buf_size) return;
+			c = exif_get_short (buf + o2, n->order);
+			if ((!(c & 0xFF)) && (c > 0x500)) {
+				if (n->order == EXIF_BYTE_ORDER_INTEL) {
+					n->order = EXIF_BYTE_ORDER_MOTOROLA;
+				} else {
+					n->order = EXIF_BYTE_ORDER_INTEL;
+				}
+			}
 			break;
 
 		case nikonV2:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libexif/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	24 May 2006 02:10:57 -0000	1.4
+++ .cvsignore	6 Feb 2008 02:13:19 -0000	1.5
@@ -1 +1 @@
-libexif-0.6.13.tar.bz2
+libexif-0.6.16.tar.bz2


Index: libexif.spec
===================================================================
RCS file: /cvs/extras/rpms/libexif/devel/libexif.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- libexif.spec	5 Feb 2008 17:59:32 -0000	1.36
+++ libexif.spec	6 Feb 2008 02:13:19 -0000	1.37
@@ -1,15 +1,15 @@
 Summary: Library for extracting extra information from image files
 Name: libexif
-Version: 0.6.15
-Release: 6%{?dist}
+Version: 0.6.16
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libexif.sourceforge.net/
 Source0: libexif-%{version}.tar.bz2 
 Source1: libexif-docs.tar.gz
-Patch0: libexif-cve-2007-4168.patch
 Patch1: cve-2007-6351.patch
 Patch2: cve-2007-6352.patch
+Patch3: olympus-byte-order.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires: doxygen
 
@@ -30,9 +30,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .cve-2007-4168
 %patch1 -p1 -b .cve-2007-6351
 %patch2 -p1 -b .cve-2007-6352
+%patch3 -p1 -b .olympus-byte-order
 
 # to avoid multilib conflicts, we toss in pre-generated docs
 # and neuter make all in the docs dir
@@ -76,6 +76,10 @@
 %{_libdir}/pkgconfig/libexif.pc
 
 %changelog
+* Tue Feb  5 2008 Matthias Clasen <mclasen at redhat.com> - 0.6.16-1
+- Update to 0.6.16
+- Drop obsolete patch
+
 * Tue Feb  5 2008 Matthias Clasen <mclasen at redhat.com> - 0.6.15-6
 - Convert doc files to utf-8 (#240838)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libexif/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 May 2007 01:40:37 -0000	1.6
+++ sources	6 Feb 2008 02:13:19 -0000	1.7
@@ -1,2 +1 @@
-58871e364c454d107eee001456cc8f24  libexif-0.6.15.tar.bz2
-916f61beb4afa88f05130b10e7640333  libexif-docs.tar.gz
+deee153b1ded5a944ea05d041d959eca  libexif-0.6.16.tar.bz2