Mailinglist Archive: opensuse-commit (1670 mails)

< Previous Next >
commit libexif5
  • From: root@xxxxxxx (h_root)
  • Date: Fri, 27 Oct 2006 19:04:02 +0200 (CEST)
  • Message-id: <20061027170402.014F4847DD@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libexif5
checked in at Fri Oct 27 19:04:02 CEST 2006.

--------
--- libexif5/libexif5.changes 2006-05-26 19:50:09.000000000 +0200
+++ /mounts/work_src_done/STABLE/libexif5/libexif5.changes 2006-10-27 11:06:38.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Oct 27 11:06:34 CEST 2006 - meissner@xxxxxxx
+
+- fixed strncat uses.
+
+-------------------------------------------------------------------

New:
----
libexif-0.5.12-strncat.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libexif5.spec ++++++
--- /var/tmp/diff_new_pack.YA9DDW/_old 2006-10-27 19:03:47.000000000 +0200
+++ /var/tmp/diff_new_pack.YA9DDW/_new 2006-10-27 19:03:47.000000000 +0200
@@ -12,14 +12,15 @@

Name: libexif5
URL: http://libexif.sourceforge.net
-License: GPL
+License: GNU General Public License (GPL) - all versions
Group: Development/Libraries/C and C++
Summary: An EXIF Tag Parsing Library for Digital Cameras
Version: 0.5.12
-Release: 17
+Release: 30
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: libexif-%{version}.tar.bz2
Patch0: canon-mnote.patch
+Patch1: libexif-0.5.12-strncat.patch

%description
This library is used to parse EXIF information from JPEGs created by
@@ -35,6 +36,7 @@
%prep
%setup -q -n libexif-%{version}
%patch0 -p1
+%patch1 -p0

%build
CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \
@@ -61,6 +63,8 @@
%{_libdir}/libexif.so.*

%changelog -n libexif5
+* Fri Oct 27 2006 - meissner@xxxxxxx
+- fixed strncat uses.
* Fri May 26 2006 - schwab@xxxxxxx
- Don't strip binaries.
* Tue Mar 21 2006 - meissner@xxxxxxx
@@ -82,14 +86,14 @@
ABI changes which have not yet migrated to all the tools.
* Mon Feb 23 2004 - meissner@xxxxxxx
- Upgraded to upstream 0.5.13:
-- bugfixes and some new features.
-- merged with libmnote
+ - bugfixes and some new features.
+ - merged with libmnote
* Wed Oct 15 2003 - meissner@xxxxxxx
- don't build as root.
* Wed Aug 06 2003 - meissner@xxxxxxx
- Upgreaded to upstream 0.5.12:
-- fixed endless loops and crashes on invalid exif data.
-- translation updates.
+ - fixed endless loops and crashes on invalid exif data.
+ - translation updates.
* Mon Jul 21 2003 - meissner@xxxxxxx
- Upgraded to upstream 0.5.10.
* Tue May 13 2003 - meissner@xxxxxxx

++++++ libexif-0.5.12-strncat.patch ++++++
--- libexif/exif-entry.c
+++ libexif/exif-entry.c
@@ -227,20 +227,20 @@
strncpy (v, e->data, MIN (sizeof (v) - 1, e->size));
else
strncpy (v, _("[None]"), sizeof (v) - 1);
- strncat (v, " ", sizeof (v) - 1);
- strncat (v, _("(Photographer)"), sizeof (v) - 1);
+ strncat (v, " ", sizeof (v) - strlen(v) - 1);
+ strncat (v, _("(Photographer)"), sizeof (v) - strlen(v) - 1);

/* Second part: Editor. */
- strncat (v, " - ", sizeof (v) - 1);
+ strncat (v, " - ", sizeof (v) - strlen(v) - 1);
if (e->size && e->data &&
(strlen ((char *) e->data) + 1 < e->size) &&
(strspn (e->data, " ") != strlen ((char *) e->data)))
strncat (v, e->data + strlen (e->data) + 1,
- sizeof (v) - 1);
+ sizeof (v) - strlen(v) - 1);
else
- strncat (v, _("[None]"), sizeof (v) - 1);
- strncat (v, " ", sizeof (v) - 1);
- strncat (v, _("(Editor)"), sizeof (v) - 1);
+ strncat (v, _("[None]"), sizeof (v) - strlen(v) - 1);
+ strncat (v, " ", sizeof (v) - strlen(v) - 1);
+ strncat (v, _("(Editor)"), sizeof (v) - strlen(v) - 1);

break;
case EXIF_TAG_FNUMBER:
@@ -393,8 +393,8 @@
case 6: c = _("B"); break;
default: c = _("reserved"); break;
}
- strncat (v, c, sizeof (v));
- if (i < 3) strncat (v, " ", sizeof (v));
+ strncat (v, c, sizeof (v) - strlen(v) - 1);
+ if (i < 3) strncat (v, " ", sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_TAG_SENSING_METHOD:
@@ -920,8 +920,8 @@
for (i = 1; i < e->components; i++) {
v_byte = e->data[i];
snprintf (b, sizeof (b), "0x%02x", v_byte);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_SHORT:
@@ -933,8 +933,8 @@
exif_format_get_size (e->format) *
i, o);
snprintf (b, sizeof (b), "%i", v_short);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_LONG:
@@ -945,8 +945,8 @@
exif_format_get_size (e->format) *
i, o);
snprintf (b, sizeof (b), "%li", v_long);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_SLONG:
@@ -957,8 +957,8 @@
exif_format_get_size (e->format) *
i, o);
snprintf (b, sizeof (b), "%li", v_long);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_ASCII:
@@ -975,8 +975,8 @@
snprintf (b, sizeof (b), "%i/%i",
(int) v_rat.numerator,
(int) v_rat.denominator);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_SRATIONAL:
@@ -990,8 +990,8 @@
snprintf (b, sizeof (b), "%i/%i",
(int) v_srat.numerator,
(int) v_srat.denominator);
- strncat (v, ", ", sizeof (v));
- strncat (v, b, sizeof (v));
+ strncat (v, ", ", sizeof (v) - strlen(v) - 1);
+ strncat (v, b, sizeof (v) - strlen(v) - 1);
}
break;
case EXIF_FORMAT_DOUBLE:

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages