From 7d2f94e4ccaef9ca7c4fca31a1bec5606c8dfe3c Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 20 Apr 2005 12:40:40 +0000 Subject: Changes 0.6.12: * Final fix of Ubuntu Security Notice USN-91-1 (CAN-2005-0664) https://bugzilla.ubuntulinux.org/show_bug.cgi?id=7152 * Updated build system with cross compile capabilities * Small fixes: Fix tag order, use even offsets, improve Nikon&Olympus mnote tags. --- graphics/libexif/Makefile | 12 ++++++------ graphics/libexif/PLIST | 9 ++++----- graphics/libexif/distinfo | 10 ++++------ graphics/libexif/patches/patch-aa | 21 --------------------- graphics/libexif/patches/patch-ab | 32 -------------------------------- 5 files changed, 14 insertions(+), 70 deletions(-) delete mode 100644 graphics/libexif/patches/patch-aa delete mode 100644 graphics/libexif/patches/patch-ab (limited to 'graphics/libexif') diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile index ae721dd710c..1e90d265881 100644 --- a/graphics/libexif/Makefile +++ b/graphics/libexif/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:05 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/04/20 12:40:40 adam Exp $ -DISTNAME= libexif-0.6.11 -PKGREVISION= 1 +DISTNAME= libexif-0.6.12 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libexif/} +EXTRACT_SUFX= .tar.bz2 MAINTAINER= adam@NetBSD.org HOMEPAGE= http://libexif.sourceforge.net/ @@ -11,9 +11,9 @@ COMMENT= EXIF file library PKG_INSTALLATION_TYPES= overwrite pkgviews -USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES -USE_LIBTOOL= YES +USE_LIBTOOL= yes +USE_PKGLOCALEDIR= yes +GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= libexif/libexif.pc.in .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/graphics/libexif/PLIST b/graphics/libexif/PLIST index 1351955c2ab..7d083d793bd 100644 --- a/graphics/libexif/PLIST +++ b/graphics/libexif/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2004/10/27 19:30:23 drochner Exp $ +@comment $NetBSD: PLIST,v 1.12 2005/04/20 12:40:40 adam Exp $ include/libexif/_stdint.h include/libexif/exif-byte-order.h include/libexif/exif-content.h @@ -10,12 +10,11 @@ include/libexif/exif-loader.h include/libexif/exif-log.h include/libexif/exif-mem.h include/libexif/exif-mnote-data.h -include/libexif/exif-result.h include/libexif/exif-tag.h include/libexif/exif-utils.h lib/libexif.la lib/pkgconfig/libexif.pc -${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libexif.mo -${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libexif.mo -${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libexif.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libexif-12.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libexif-12.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libexif-12.mo @dirrm include/libexif diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo index 2fd7f941efc..88c732927cf 100644 --- a/graphics/libexif/distinfo +++ b/graphics/libexif/distinfo @@ -1,7 +1,5 @@ -$NetBSD: distinfo,v 1.12 2005/03/10 19:22:22 adam Exp $ +$NetBSD: distinfo,v 1.13 2005/04/20 12:40:40 adam Exp $ -SHA1 (libexif-0.6.11.tar.gz) = f522e097edfccac420c7779209aafeebbf09aa7c -RMD160 (libexif-0.6.11.tar.gz) = 306637ba3ce8b8a0c095ef5da5792d178bda37fb -Size (libexif-0.6.11.tar.gz) = 546277 bytes -SHA1 (patch-aa) = bcbdc84fc26c64ecac62699ab11bf55afe6b65c7 -SHA1 (patch-ab) = d778a593bc70a4c3a1413a4bfa508e98fdf2f71a +SHA1 (libexif-0.6.12.tar.bz2) = 5d2c5976521e179d41ff8908b678b14f2e8e690b +RMD160 (libexif-0.6.12.tar.bz2) = 24cfdb7663f0566f2907987e5dbc472c21b583d9 +Size (libexif-0.6.12.tar.bz2) = 378650 bytes diff --git a/graphics/libexif/patches/patch-aa b/graphics/libexif/patches/patch-aa deleted file mode 100644 index a827de40cae..00000000000 --- a/graphics/libexif/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2004/10/27 19:30:23 drochner Exp $ - ---- configure.orig 2004-10-27 15:07:12.000000000 +0200 -+++ configure -@@ -25641,7 +25641,7 @@ if test "x$GCC" = "xyes"; then - - fi - -- ac_config_files="$ac_config_files Makefile libexif.spec libexif/Makefile libexif/canon/Makefile libexif/olympus/Makefile libexif/pentax/Makefile libjpeg/Makefile test/Makefile m4/Makefile libexif/libexif.pc" -+ ac_config_files="$ac_config_files Makefile libexif.spec libexif/Makefile libexif/canon/Makefile libexif/olympus/Makefile libexif/pentax/Makefile libjpeg/Makefile po/Makefile.in test/Makefile m4/Makefile libexif/libexif.pc" - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure - # tests run on this system so they can be shared between configure -@@ -26219,6 +26219,7 @@ do - "libexif/olympus/Makefile" ) CONFIG_FILES="$CONFIG_FILES libexif/olympus/Makefile" ;; - "libexif/pentax/Makefile" ) CONFIG_FILES="$CONFIG_FILES libexif/pentax/Makefile" ;; - "libjpeg/Makefile" ) CONFIG_FILES="$CONFIG_FILES libjpeg/Makefile" ;; -+ "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; - "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "m4/Makefile" ) CONFIG_FILES="$CONFIG_FILES m4/Makefile" ;; - "libexif/libexif.pc" ) CONFIG_FILES="$CONFIG_FILES libexif/libexif.pc" ;; diff --git a/graphics/libexif/patches/patch-ab b/graphics/libexif/patches/patch-ab deleted file mode 100644 index 6f1806095c9..00000000000 --- a/graphics/libexif/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2005/03/10 19:22:22 adam Exp $ - ---- libexif/exif-data.c.orig Tue Oct 5 21:10:04 2004 -+++ libexif/exif-data.c -@@ -628,7 +628,7 @@ exif_data_load_data (ExifData *data, con - "Found EXIF header."); - - /* Byte order (offset 6, length 2) */ -- if (ds < 12) -+ if (ds < 14) - return; - if (!memcmp (d + 6, "II", 2)) - data->priv->order = EXIF_BYTE_ORDER_INTEL; -@@ -646,12 +646,18 @@ exif_data_load_data (ExifData *data, con - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", - "IFD 0 at %i.", (int) offset); - -+ if (ds < 6 + 4 + offset) -+ return; -+ - /* Parse the actual exif data (offset 14) */ - exif_data_load_data_content (data, data->ifd[EXIF_IFD_0], d + 6, - ds - 6, offset); - - /* IFD 1 offset */ - n = exif_get_short (d + 6 + offset, data->priv->order); -+ if (ds < 6 + offset + 2 + 12 * n + 4) -+ return; -+ - offset = exif_get_long (d + 6 + offset + 2 + 12 * n, data->priv->order); - if (offset) { - exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG, "ExifData", -- cgit v1.2.3