Major upgrade to 2.01, too many bugs fixed to list. Comments ? Ok ? Cheers Giovanni
Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 14 Jun 2014 23:25:21 -0000 1.18 +++ Makefile 12 Jul 2014 17:12:18 -0000 @@ -4,19 +4,17 @@ COMMENT= interface to read EXIF tags in SHARED_ONLY= Yes -DISTNAME= Image-EXIF-0.98.6 -REVISION= 4 +DISTNAME= Image-EXIF-2.01 CATEGORIES= graphics MAINTAINER= Dan Weeks <[email protected]> MODULES= cpan +CPAN_AUTHOR= ARC # BSD PERMIT_PACKAGE_CDROM= Yes WANTLIB += c exif>=8 - -EXTRACT_SUFX= .tgz LIB_DEPENDS= graphics/libexif Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 16:19:57 -0000 1.3 +++ distinfo 12 Jul 2014 17:12:24 -0000 @@ -1,5 +1,2 @@ -MD5 (Image-EXIF-0.98.6.tgz) = Oh+/mUOrD4cmVeTJq6H6DA== -RMD160 (Image-EXIF-0.98.6.tgz) = RvTpPmkENO96JgpQbcqEylPad3Y= -SHA1 (Image-EXIF-0.98.6.tgz) = /rtLJ6K9kl47Te5KyH+IJP9xDOs= -SHA256 (Image-EXIF-0.98.6.tgz) = LYqAKNylCVVGKvj03klRix84ya4s0Mp6ZrRm7GYynZA= -SIZE (Image-EXIF-0.98.6.tgz) = 45835 +SHA256 (Image-EXIF-2.01.tar.gz) = ywi/6KQr9VZeX6nv/upk5wtWJm7Kp3TsazkuS3l/TNw= +SIZE (Image-EXIF-2.01.tar.gz) = 57024 Index: patches/patch-EXIF_xs =================================================================== RCS file: patches/patch-EXIF_xs diff -N patches/patch-EXIF_xs --- patches/patch-EXIF_xs 14 Nov 2005 17:48:00 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-EXIF_xs,v 1.3 2005/11/14 17:48:00 pvalchev Exp $ ---- EXIF.xs.orig Wed Jan 14 15:12:54 2004 -+++ EXIF.xs Mon Nov 14 10:30:18 2005 -@@ -29,10 +29,10 @@ read_data(char *fname) - mode = "r"; - #endif - -- if(strcmp(fname, _file_name)){ -+ if (strncmp(fname, _file_name, sizeof(_file_name)-1)) { - fpn = fopen(fname, mode); - if (fpn) -- strcpy(_file_name, fname); -+ strlcpy(_file_name, fname, sizeof(_file_name)); - else - _file_name[0] = '\0'; - } else { Index: patches/patch-Makefile_PL =================================================================== RCS file: patches/patch-Makefile_PL diff -N patches/patch-Makefile_PL --- patches/patch-Makefile_PL 14 Nov 2005 17:32:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-Makefile_PL,v 1.2 2005/11/14 17:32:12 pvalchev Exp $ ---- Makefile.PL.orig Wed Jan 14 15:12:54 2004 -+++ Makefile.PL Mon Nov 14 10:09:54 2005 -@@ -8,7 +8,7 @@ WriteMakefile( - ($] >= 5.005 ? ## Add these new keywords supported since 5.005 - (ABSTRACT_FROM => 'EXIF.pm', # retrieve abstract from module - AUTHOR => 'sergey s prozhogin <[email protected]>') : ()), -- 'LIBS' => ['-lexif'], # e.g., '-lm' -+ 'LIBS' => ['-L/usr/local/lib -lexif'], # e.g., '-lm' - 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - # Insert -I. if you add *.h files later: - 'INC' => '', # e.g., '-I/usr/include/other' Index: patches/patch-canon_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-canon_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-canon_c --- patches/patch-canon_c 14 Nov 2005 17:39:03 -0000 1.2 +++ patches/patch-canon_c 12 Jul 2014 17:46:07 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 17:39:03 pvalchev Exp $ ---- canon.c.orig 2004-05-03 11:31:28.000000000 -0700 -+++ canon.c 2004-05-03 11:56:30.000000000 -0700 -@@ -775,14 +775,14 @@ canon_prop01(struct exifprop *aprop, str +--- canon.c.orig Fri May 11 19:03:30 2012 ++++ canon.c Sat Jul 12 19:43:53 2014 +@@ -943,14 +943,14 @@ canon_prop01(struct exifprop *aprop, struct exifprop * switch (aprop->tag) { case 2: aprop->lvl = v ? ED_IMG : ED_VRB; @@ -13,13 +13,13 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 case 5: /* Change "Single" to "Timed" if #2 > 0. */ - if (!v && exif2byte(off + 2 * 2, o)) + if (!v && exif2byte(off + 2 * 2, t->mkrmd.order)) - strcpy(aprop->str, "Timed"); + strlcpy(aprop->str, "Timed", PROPSTR_SIZE); break; case 12: aprop->lvl = v ? ED_IMG : ED_VRB; -@@ -793,8 +793,8 @@ canon_prop01(struct exifprop *aprop, str +@@ -961,8 +961,8 @@ canon_prop01(struct exifprop *aprop, struct exifprop * */ if (v == 3 && prop->count >= 37) { @@ -27,10 +27,21 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 - snprintf(aprop->str, 31, "x%.1f", 2 * + exifstralloc(&aprop->str, PROPSTR_SIZE); + snprintf(aprop->str, PROPSTR_SIZE, "x%.1f", 2 * - (float)exif2byte(off + 37 * 2, o) / - (float)exif2byte(off + 36 * 2, o)); + (float)exif2byte(off + 37 * 2, t->mkrmd.order) / + (float)exif2byte(off + 36 * 2, t->mkrmd.order)); } else -@@ -857,8 +857,8 @@ canon_propA0(struct exifprop *aprop, str +@@ -1010,8 +1010,8 @@ canon_prop04(struct exifprop *aprop, struct exifprop * + switch (aprop->tag) { + case 6: + /* Calculate sensor speed (ISO units). */ +- exifstralloc(&aprop->str, 32); +- snprintf(aprop->str, 31, "%d", (int)(exp(calcev(NULL, 0, v) * ++ exifstralloc(&aprop->str, PROPSTR_SIZE); ++ snprintf(aprop->str, PROPSTR_SIZE, "%d", (int)(exp(calcev(NULL, 0, v) * + log(2)) * 100.0 / 32.0 + 0.5)); + break; + +@@ -1087,8 +1087,8 @@ canon_propA0(struct exifprop *aprop, struct exifprop * switch (aprop->tag) { case 9: @@ -41,7 +52,7 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 break; default: return (FALSE); -@@ -917,8 +917,8 @@ canon_subval(struct exifprop *prop, stru +@@ -1147,8 +1147,8 @@ canon_subval(struct exifprop *prop, struct exiftags *t if (valfun && !valfun(aprop, prop, off, t)) { if (aprop->lvl != ED_UNK) continue; @@ -52,7 +63,7 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 } } -@@ -1040,14 +1040,14 @@ canon_prop(struct exifprop *prop, struct +@@ -1271,14 +1271,14 @@ canon_prop(struct exifprop *prop, struct exiftags *t) tmpprop = childprop(prop); tmpprop->name = "CanonLensSz"; tmpprop->descr = "Lens Size"; @@ -70,14 +81,3 @@ $OpenBSD: patch-canon_c,v 1.2 2005/11/14 (float)flmin / (float)flunit, (float)flmax / (float)flunit); tmpprop->lvl = ED_PAS; -@@ -1075,8 +1075,8 @@ canon_prop(struct exifprop *prop, struct - /* Image number. */ - - case 0x0008: -- exifstralloc(&prop->str, 32); -- snprintf(prop->str, 31, "%03d-%04d", prop->value / 10000, -+ exifstralloc(&prop->str, PROPSTR_SIZE); -+ snprintf(prop->str, PROPSTR_SIZE, "%03d-%04d", prop->value / 10000, - prop->value % 10000); - break; - Index: patches/patch-exif_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-exif_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-exif_c --- patches/patch-exif_c 17 May 2004 05:09:52 -0000 1.1.1.1 +++ patches/patch-exif_c 12 Jul 2014 17:40:46 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05/17 05:09:52 robert Exp $ ---- exif.c.orig 2004-01-14 14:12:54.000000000 -0800 -+++ exif.c 2004-05-03 11:44:51.000000000 -0700 -@@ -257,8 +257,7 @@ postprop(struct exifprop *prop, struct e +--- exif.c.orig Fri May 11 19:03:30 2012 ++++ exif.c Sat Jul 12 19:39:39 2014 +@@ -283,8 +283,7 @@ postprop(struct exifprop *prop, struct exiftags *t) } val = exif4byte(t->md.btiff + prop->value, o) / exif4byte(t->md.btiff + prop->value + 4, o); @@ -11,7 +11,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 break; /* -@@ -272,14 +271,13 @@ postprop(struct exifprop *prop, struct e +@@ -298,14 +297,13 @@ postprop(struct exifprop *prop, struct exiftags *t) (float)exif4sbyte(t->md.btiff + prop->value + 4, o); if (isnan(fval)) fval = 0; /* 1 / (2^speed) */ @@ -28,7 +28,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 if (prop->tag == EXIF_T_EXPOSURE) prop->override = EXIF_T_SHUTTER; break; -@@ -288,8 +286,7 @@ postprop(struct exifprop *prop, struct e +@@ -314,8 +312,7 @@ postprop(struct exifprop *prop, struct exiftags *t) fval = (float)exif4byte(t->md.btiff + prop->value, o) / (float)exif4byte(t->md.btiff + prop->value + 4, o); if (isnan(fval)) fval = 0; @@ -38,7 +38,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 break; case EXIF_T_LAPERTURE: -@@ -298,36 +295,34 @@ postprop(struct exifprop *prop, struct e +@@ -324,36 +321,34 @@ postprop(struct exifprop *prop, struct exiftags *t) (float)exif4byte(t->md.btiff + prop->value + 4, o); if (isnan(fval)) fval = 0; /* sqrt(2)^aperture */ @@ -81,7 +81,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 break; /* Flash consists of a number of bits, which expanded with v2.2. */ -@@ -344,15 +339,14 @@ postprop(struct exifprop *prop, struct e +@@ -384,15 +379,14 @@ postprop(struct exifprop *prop, struct exiftags *t) fval = (float)exif4byte(t->md.btiff + prop->value, o) / (float)exif4byte(t->md.btiff + prop->value + 4, o); if (isnan(fval)) fval = 0; @@ -99,7 +99,7 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 else if (exif4byte(t->md.btiff + prop->value, o) != exif4byte(t->md.btiff + prop->value + 4, o)) break; -@@ -361,7 +355,7 @@ postprop(struct exifprop *prop, struct e +@@ -401,7 +395,7 @@ postprop(struct exifprop *prop, struct exiftags *t) case EXIF_T_FOCALLEN35: exifstralloc(&prop->str, 16); @@ -108,16 +108,16 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 break; /* -@@ -502,7 +496,7 @@ parsetag(struct exifprop *prop, struct i - t->exifmin = (short)atoi(buf + 2); - buf[2] = '\0'; +@@ -566,7 +560,7 @@ parsetag(struct exifprop *prop, struct ifd *dir, struc t->exifmaj = (short)atoi(buf); -- snprintf(prop->str, 7, "%d.%d", t->exifmaj, t->exifmin); -+ snprintf(prop->str, 8, "%d.%d", t->exifmaj, t->exifmin); + + exifstralloc(&prop->str, 8); +- snprintf(prop->str, 7, "%d.%02d", t->exifmaj, t->exifmin); ++ snprintf(prop->str, 8, "%d.%02d", t->exifmaj, t->exifmin); break; /* Process a maker note. */ -@@ -599,7 +593,7 @@ parsetag(struct exifprop *prop, struct i +@@ -680,7 +674,7 @@ parsetag(struct exifprop *prop, struct ifd *dir, struc while (d > c && isspace((int)*(d - 1))) --d; exifstralloc(&prop->str, d - c + 1); @@ -126,20 +126,20 @@ $OpenBSD: patch-exif_c,v 1.1.1.1 2004/05 prop->lvl = prop->str[0] ? ED_IMG : ED_VRB; return; } -@@ -627,8 +621,8 @@ parsetag(struct exifprop *prop, struct i - (prop->value + prop->count <= - (u_int32_t)(dir->md.etiff - btiff))) { - exifstralloc(&prop->str, prop->count + 1); -- strncpy(prop->str, (const char *)(btiff + prop->value), -- prop->count); -+ strlcpy(prop->str, (const char *)(btiff + prop->value), -+ (prop->count + 1)); +@@ -714,8 +708,8 @@ parsetag(struct exifprop *prop, struct ifd *dir, struc + /* Sanity check the offset. */ + if (!offsanity(prop, 1, dir)) { + exifstralloc(&prop->str, prop->count + 1); +- strncpy(prop->str, (const char *)(btiff + prop->value), +- prop->count); ++ strlcpy(prop->str, (const char *)(btiff + prop->value), ++ prop->count + 1); + } return; } - -@@ -641,7 +635,7 @@ parsetag(struct exifprop *prop, struct i - (prop->value + prop->count * 8 <= - (u_int32_t)(dir->md.etiff - btiff))) { +@@ -730,7 +724,7 @@ parsetag(struct exifprop *prop, struct ifd *dir, struc + if ((prop->type == TIFF_RTNL || prop->type == TIFF_SRTNL) && + !offsanity(prop, 8, dir)) { - exifstralloc(&prop->str, 32); + exifstralloc(&prop->str, PROPSTR_SIZE); Index: patches/patch-exif_h =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-exif_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-exif_h --- patches/patch-exif_h 17 May 2004 05:09:52 -0000 1.1.1.1 +++ patches/patch-exif_h 12 Jul 2014 17:40:46 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-exif_h,v 1.1.1.1 2004/05/17 05:09:52 robert Exp $ ---- exif.h.orig 2004-05-03 11:06:45.000000000 -0700 -+++ exif.h 2004-05-03 11:07:29.000000000 -0700 +--- exif.h.orig Fri May 11 19:03:30 2012 ++++ exif.h Sat Jul 12 19:34:34 2014 @@ -46,6 +46,8 @@ #include <sys/types.h> @@ -9,4 +9,4 @@ $OpenBSD: patch-exif_h,v 1.1.1.1 2004/05 +#define PROPSTR_SIZE 32 /* - * XXX Only checking for Solaris & Windows now. Other platforms will + * XXX Only checking for Solaris, HP, & Windows now. Other platforms will Index: patches/patch-exifgps_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-exifgps_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-exifgps_c --- patches/patch-exifgps_c 17 May 2004 05:09:52 -0000 1.1.1.1 +++ patches/patch-exifgps_c 12 Jul 2014 17:40:46 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004/05/17 05:09:52 robert Exp $ ---- exifgps.c.orig 2004-05-03 11:15:53.000000000 -0700 -+++ exifgps.c 2004-05-03 11:46:31.000000000 -0700 -@@ -252,7 +252,7 @@ gpsprop(struct exifprop *prop, struct ex +--- exifgps.c.orig Fri May 11 19:03:30 2012 ++++ exifgps.c Sat Jul 12 19:34:34 2014 +@@ -253,7 +253,7 @@ gpsprop(struct exifprop *prop, struct exiftags *t) free(prop->str); prop->str = NULL; @@ -10,7 +10,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004 /* Figure out the reference prefix. */ -@@ -279,13 +279,13 @@ gpsprop(struct exifprop *prop, struct ex +@@ -280,13 +280,13 @@ gpsprop(struct exifprop *prop, struct exiftags *t) n = exif4byte(t->md.btiff + prop->value + i * 8, o); d = exif4byte(t->md.btiff + prop->value + 4 + i * 8, o); @@ -26,7 +26,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004 (int)log10((double)d)); } -@@ -297,14 +297,14 @@ gpsprop(struct exifprop *prop, struct ex +@@ -298,14 +298,14 @@ gpsprop(struct exifprop *prop, struct exiftags *t) if (!n || !d) { /* Punt. */ min = 0.0; @@ -45,7 +45,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004 } /* -@@ -317,18 +317,18 @@ gpsprop(struct exifprop *prop, struct ex +@@ -318,18 +318,18 @@ gpsprop(struct exifprop *prop, struct exiftags *t) d = exif4byte(t->md.btiff + prop->value + 4 + i * 8, o); if (!n || !d) { /* Assume no seconds. */ @@ -69,7 +69,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004 tmpprop->str : "", deg, DEGREE, min, sec); break; -@@ -351,8 +351,7 @@ gpsprop(struct exifprop *prop, struct ex +@@ -352,8 +352,7 @@ gpsprop(struct exifprop *prop, struct exiftags *t) /* Should already have a 32-byte buffer from parsetag(). */ @@ -79,7 +79,7 @@ $OpenBSD: patch-exifgps_c,v 1.1.1.1 2004 break; /* Time. */ -@@ -368,13 +367,13 @@ gpsprop(struct exifprop *prop, struct ex +@@ -369,13 +368,13 @@ gpsprop(struct exifprop *prop, struct exiftags *t) if (!d) break; if (!i) Index: patches/patch-exifutil_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-exifutil_c,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-exifutil_c --- patches/patch-exifutil_c 17 May 2004 05:09:52 -0000 1.1.1.1 +++ patches/patch-exifutil_c 12 Jul 2014 17:40:46 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-exifutil_c,v 1.1.1.1 2004/05/17 05:09:52 robert Exp $ ---- exifutil.c.orig 2004-05-03 11:34:15.000000000 -0700 -+++ exifutil.c 2004-05-03 11:35:12.000000000 -0700 -@@ -165,7 +165,7 @@ finddescr(struct descrip *table, u_int16 +--- exifutil.c.orig Fri May 11 19:03:30 2012 ++++ exifutil.c Sat Jul 12 19:34:34 2014 +@@ -219,7 +219,7 @@ finddescr(struct descrip *table, u_int16_t val) for (i = 0; table[i].val != -1 && table[i].val != val; i++); if (!(c = (char *)malloc(strlen(table[i].descr) + 1))) exifdie((const char *)strerror(errno)); Index: patches/patch-minolta_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-minolta_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-minolta_c --- patches/patch-minolta_c 14 Nov 2005 17:39:03 -0000 1.2 +++ patches/patch-minolta_c 12 Jul 2014 17:40:46 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/14 17:39:03 pvalchev Exp $ ---- minolta.c.orig 2004-05-03 11:35:20.000000000 -0700 -+++ minolta.c 2004-05-03 11:56:00.000000000 -0700 -@@ -484,10 +484,10 @@ minolta_cprop(struct exifprop *prop, uns +--- minolta.c.orig Fri May 11 19:03:30 2012 ++++ minolta.c Sat Jul 12 19:40:37 2014 +@@ -484,10 +484,10 @@ minolta_cprop(struct exifprop *prop, unsigned char *of aprop->str = valbuf; valbuf = NULL; if (aprop->value != 6) @@ -14,7 +14,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ break; /* Camera model (saved for 7Hi stupidity). */ -@@ -501,7 +501,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -501,7 +501,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of case 18: aprop->str = valbuf; valbuf = NULL; @@ -23,7 +23,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ (double)aprop->value / 256); break; -@@ -512,7 +512,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -512,7 +512,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of case 30: aprop->str = valbuf; valbuf = NULL; @@ -32,7 +32,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ (double)aprop->value / 256); break; -@@ -523,7 +523,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -523,7 +523,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of valbuf = NULL; v = (u_int16_t)(pow(2, ((double)aprop->value / 8) - 1) * (double)3.125); @@ -41,7 +41,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ break; /* Aperture and max aperture. */ -@@ -533,7 +533,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -533,7 +533,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of aprop->str = valbuf; valbuf = NULL; d = pow(2, ((double)aprop->value / 16) - 0.5); @@ -50,7 +50,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ break; /* Exposure time. */ -@@ -546,9 +546,9 @@ minolta_cprop(struct exifprop *prop, uns +@@ -546,9 +546,9 @@ minolta_cprop(struct exifprop *prop, unsigned char *of /* 1 sec limit. */ if (aprop->value < 56) @@ -62,7 +62,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ (unsigned int)d); #if 0 /* -@@ -568,9 +568,9 @@ minolta_cprop(struct exifprop *prop, uns +@@ -568,9 +568,9 @@ minolta_cprop(struct exifprop *prop, unsigned char *of aprop->str = valbuf; valbuf = NULL; if (!aprop->value) @@ -74,7 +74,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ (float)(aprop->value / (float)1000)); aprop->value /= 100; break; -@@ -587,7 +587,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -587,7 +587,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of aprop->str = valbuf; valbuf = NULL; byte4exif(aprop->value, buf, LITTLE); @@ -83,7 +83,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ buf[0], buf[1], buf[3] << 8 | buf[2]); break; -@@ -597,7 +597,7 @@ minolta_cprop(struct exifprop *prop, uns +@@ -597,7 +597,7 @@ minolta_cprop(struct exifprop *prop, unsigned char *of aprop->str = valbuf; valbuf = NULL; byte4exif(aprop->value, buf, LITTLE); @@ -92,7 +92,7 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ buf[2], buf[1], buf[0]); break; -@@ -631,9 +631,9 @@ minolta_cprop(struct exifprop *prop, uns +@@ -631,9 +631,9 @@ minolta_cprop(struct exifprop *prop, unsigned char *of valbuf = NULL; aprop->value -= 3; if (aprop->value) @@ -104,12 +104,12 @@ $OpenBSD: patch-minolta_c,v 1.2 2005/11/ break; /* Scene. */ -@@ -663,7 +663,7 @@ minolta_naval(struct exifprop *props, st +@@ -663,7 +663,7 @@ minolta_naval(struct exifprop *props, struct exiftag * free(prop->str); prop->str = NULL; exifstralloc(&prop->str, strlen(na) + 1); - strcpy(prop->str, na); + strlcpy(prop->str, na, (strlen(na) + 1)); - prop->lvl = ED_BAD; + if (!(prop->lvl & ED_UNK)) + prop->lvl = ED_VRB; } - Index: patches/patch-olympus_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-olympus_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-olympus_c --- patches/patch-olympus_c 14 Nov 2005 17:39:03 -0000 1.2 +++ patches/patch-olympus_c 12 Jul 2014 17:40:46 -0000 @@ -1,8 +1,8 @@ $OpenBSD: patch-olympus_c,v 1.2 2005/11/14 17:39:03 pvalchev Exp $ ---- olympus.c.orig 2004-05-03 11:49:52.000000000 -0700 -+++ olympus.c 2004-05-03 11:58:11.000000000 -0700 -@@ -144,16 +144,16 @@ olympus_prop(struct exifprop *prop, stru - b = exif4byte(t->md.btiff + prop->value + 4, t->md.order); +--- olympus.c.orig Fri May 11 19:03:30 2012 ++++ olympus.c Sat Jul 12 19:34:34 2014 +@@ -144,16 +144,16 @@ olympus_prop(struct exifprop *prop, struct exiftags *t + b = exif4byte(t->mkrmd.btiff + prop->value + 4, t->mkrmd.order); if (a == b) - snprintf(prop->str, 31, "None"); Index: patches/patch-sanyo_c =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/patches/patch-sanyo_c,v retrieving revision 1.2 diff -u -p -r1.2 patch-sanyo_c --- patches/patch-sanyo_c 14 Nov 2005 17:39:03 -0000 1.2 +++ patches/patch-sanyo_c 12 Jul 2014 17:40:46 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-sanyo_c,v 1.2 2005/11/14 17:39:03 pvalchev Exp $ ---- sanyo.c.orig 2004-05-03 11:50:01.000000000 -0700 -+++ sanyo.c 2004-05-03 11:58:29.000000000 -0700 -@@ -318,7 +318,7 @@ sanyo_prop(struct exifprop *prop, struct +--- sanyo.c.orig Fri May 11 19:03:30 2012 ++++ sanyo.c Sat Jul 12 19:34:34 2014 +@@ -318,7 +318,7 @@ sanyo_prop(struct exifprop *prop, struct exiftags *t) (u_int16_t)((prop->value >> 8) & 0xff)); c2 = finddescr(sanyo_res, (u_int16_t)(prop->value & 0xff)); exifstralloc(&prop->str, strlen(c1) + strlen(c2) + 3); @@ -10,8 +10,8 @@ $OpenBSD: patch-sanyo_c,v 1.2 2005/11/14 free(c1); free(c2); break; -@@ -330,9 +330,9 @@ sanyo_prop(struct exifprop *prop, struct - b = exif4byte(t->md.btiff + prop->value + 4, t->md.order); +@@ -330,9 +330,9 @@ sanyo_prop(struct exifprop *prop, struct exiftags *t) + b = exif4byte(t->mkrmd.btiff + prop->value + 4, t->mkrmd.order); if (!a || !b || a == b) - snprintf(prop->str, 31, "None"); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/p5-Image-EXIF/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 14 Jun 2014 23:25:21 -0000 1.3 +++ pkg/PLIST 12 Jul 2014 17:16:48 -0000 @@ -1,12 +1,11 @@ @comment $OpenBSD: PLIST,v 1.3 2014/06/14 23:25:21 sthen Exp $ +@comment ${P5ARCH}/Image/create_web_gallery.pl +@comment ${P5ARCH}/auto/Image/EXIF/EXIF.bs ${P5ARCH}/ ${P5ARCH}/Image/ ${P5ARCH}/Image/EXIF.pm -@comment ${P5ARCH}/Image/create_web_gallery.pl ${P5ARCH}/auto/ ${P5ARCH}/auto/Image/ ${P5ARCH}/auto/Image/EXIF/ -@comment ${P5ARCH}/auto/Image/EXIF/EXIF.bs ${P5ARCH}/auto/Image/EXIF/EXIF.so -${P5ARCH}/auto/Image/EXIF/autosplit.ix @man man/man3p/Image::EXIF.3p
