diff options
author | dillo <dillo> | 2005-07-24 00:06:44 +0000 |
---|---|---|
committer | dillo <dillo> | 2005-07-24 00:06:44 +0000 |
commit | 9bd95d38ec4655ab3f6b1ed15d3a93fcee57cd11 (patch) | |
tree | dda75b6360ba0694d5251e404b378cc1e0ea1add /graphics/libexif | |
parent | a4c9c3fed056305431a826dde1ed37e0371142a9 (diff) | |
download | pkgsrc-9bd95d38ec4655ab3f6b1ed15d3a93fcee57cd11.tar.gz |
Add patch to fix a braino which leads to crash in GIMP when opening
JPEG pictures with certain EXIF data, like those from SONY, Nikon
or Canon digital cameras.
Obtained from libexif CVS, exif-data.c, rev. 1.68, via FreeBSD.
Noted by Leonard Schmidt on tech-pkg.
Diffstat (limited to 'graphics/libexif')
-rw-r--r-- | graphics/libexif/Makefile | 4 | ||||
-rw-r--r-- | graphics/libexif/buildlink3.mk | 4 | ||||
-rw-r--r-- | graphics/libexif/distinfo | 3 | ||||
-rw-r--r-- | graphics/libexif/patches/patch-ad | 11 |
4 files changed, 17 insertions, 5 deletions
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile index 45c2a858802..dea52a723a3 100644 --- a/graphics/libexif/Makefile +++ b/graphics/libexif/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2005/05/13 11:57:59 salo Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/24 00:06:44 dillo Exp $ DISTNAME= libexif-0.6.12 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libexif/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/libexif/buildlink3.mk b/graphics/libexif/buildlink3.mk index 7ff01d4d2a4..c3ed6dad6d5 100644 --- a/graphics/libexif/buildlink3.mk +++ b/graphics/libexif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2005/05/13 11:57:59 salo Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2005/07/24 00:06:44 dillo Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBEXIF_BUILDLINK3_MK:= ${LIBEXIF_BUILDLINK3_MK}+ @@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+= libexif .if !empty(LIBEXIF_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.libexif+= libexif>=0.6.11 -BUILDLINK_RECOMMENDED.libexif+= libexif>=0.6.12nb1 +BUILDLINK_RECOMMENDED.libexif+= libexif>=0.6.12nb2 BUILDLINK_PKGSRCDIR.libexif?= ../../graphics/libexif .endif # LIBEXIF_BUILDLINK3_MK diff --git a/graphics/libexif/distinfo b/graphics/libexif/distinfo index fe5ba97f962..46862c6f7e9 100644 --- a/graphics/libexif/distinfo +++ b/graphics/libexif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2005/05/27 14:20:36 jschauma Exp $ +$NetBSD: distinfo,v 1.17 2005/07/24 00:06:44 dillo Exp $ SHA1 (libexif-0.6.12.tar.bz2) = 5d2c5976521e179d41ff8908b678b14f2e8e690b RMD160 (libexif-0.6.12.tar.bz2) = 24cfdb7663f0566f2907987e5dbc472c21b583d9 @@ -6,3 +6,4 @@ Size (libexif-0.6.12.tar.bz2) = 378650 bytes SHA1 (patch-aa) = e32ab9cad1720f0b4d6178240e78193a97c4c876 SHA1 (patch-ab) = 973ca09fc059d74e3221bba12e6e8f4630db20bb SHA1 (patch-ac) = 0aa196539b3e272487dd85a4cccf0f1b7761d132 +SHA1 (patch-ad) = d5402a6c6913d3b5ba2c93142928ae029ed19046 diff --git a/graphics/libexif/patches/patch-ad b/graphics/libexif/patches/patch-ad new file mode 100644 index 00000000000..e8471c262f1 --- /dev/null +++ b/graphics/libexif/patches/patch-ad @@ -0,0 +1,11 @@ +--- libexif/exif-data.c.orig Sun Mar 13 03:27:13 2005 ++++ libexif/exif-data.c Wed Apr 13 22:42:35 2005 +@@ -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); |