diff options
| author | gdt <gdt> | 2009-04-19 16:58:29 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2009-04-19 16:58:29 +0000 |
| commit | b8a0f474d31d5a10e946b414a1a023bade0ef7a5 (patch) | |
| tree | 8435cc1d8f83e72cb0d2a944462bad16ebfc417f | |
| parent | b858cfa1c2fd460c293c773513be5eaeee4490d2 (diff) | |
| download | pkgsrc-b8a0f474d31d5a10e946b414a1a023bade0ef7a5.tar.gz | |
Update to 1.18a released by Marti Maria. Call it 1.18.0.1 in pkgsrc
so that it sorts correctly, and leave 1.18.1 available for a possible
future upstream bugfix point release.
Changes since 1.18:
incorporate the fix in our patch-aa
(No need to pull to pkgsrc-stable; this is the same as 1.18nb2)
| -rw-r--r-- | graphics/lcms/Makefile | 12 | ||||
| -rw-r--r-- | graphics/lcms/distinfo | 8 | ||||
| -rw-r--r-- | graphics/lcms/patches/patch-aa | 28 |
3 files changed, 13 insertions, 35 deletions
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 6c15a7ac5ca..fc4dba9157c 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -1,7 +1,9 @@ -# $NetBSD: Makefile,v 1.29 2009/04/14 18:54:38 tron Exp $ +# $NetBSD: Makefile,v 1.30 2009/04/19 16:58:29 gdt Exp $ -DISTNAME= lcms-1.18 -PKGREVISION= 2 +DISTNAME= lcms-1.18a +# 1.18a is a bugfix semi-release after 1.18, and it's just 1.18 with a +# security patch +PKGNAME= lcms-1.18.0.1 CATEGORIES= graphics MASTER_SITES= http://www.littlecms.com/ @@ -12,6 +14,10 @@ COMMENT= Little Color Management System -- a color management library PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir +# lcms-1.18a should unpack to lcms-1.18a, but it isn't really a normal +# release +WRKSRC= ${WRKDIR}/lcms-1.18 + GNU_CONFIGURE= yes USE_LIBTOOL= yes TEST_TARGET= check diff --git a/graphics/lcms/distinfo b/graphics/lcms/distinfo index 53c42d80185..fed9d93bdb2 100644 --- a/graphics/lcms/distinfo +++ b/graphics/lcms/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.21 2009/04/14 19:24:30 tron Exp $ +$NetBSD: distinfo,v 1.22 2009/04/19 16:58:29 gdt Exp $ -SHA1 (lcms-1.18.tar.gz) = 7001badb14b2e9cb89e2637bdc56f23ebff2d40e -RMD160 (lcms-1.18.tar.gz) = 76c37ac029f733bbb9a850234e62bfd2a4a04bf4 -Size (lcms-1.18.tar.gz) = 915536 bytes +SHA1 (lcms-1.18a.tar.gz) = 657837dcc3992a0b0aa538c4b5a4ead82a7cbbb3 +RMD160 (lcms-1.18a.tar.gz) = 98219a12e5a1d333e82d3c36de13ac88e10c366e +Size (lcms-1.18a.tar.gz) = 930618 bytes SHA1 (patch-aa) = 44935882aa804380c47a24e26cb2e272d29f3826 diff --git a/graphics/lcms/patches/patch-aa b/graphics/lcms/patches/patch-aa deleted file mode 100644 index ddae35500dc..00000000000 --- a/graphics/lcms/patches/patch-aa +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-aa,v 1.11 2009/04/14 19:24:30 tron Exp $ - -Patch for SA34634/CVE-2009-0793 taken from Redhat's Bugzilla: - -https://bugzilla.redhat.com/attachment.cgi?id=337279 - ---- src/cmsxform.c.orig 2009-03-21 15:31:52.000000000 +0000 -+++ src/cmsxform.c 2009-04-14 19:18:05.000000000 +0100 -@@ -660,6 +660,9 @@ - GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag); - FromLstarToXYZ(GrayTRC, Shapes1); - -+ if (GrayTRC == NULL) -+ return NULL; -+ - // Reversing must be done after curve translation - - Shapes[0] = cmsReverseGamma(Shapes1[0]->nEntries, Shapes1[0]); -@@ -675,6 +678,9 @@ - - GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag); // Y - -+ if (GrayTRC == NULL) -+ return NULL; -+ - Shapes[0] = cmsDupGamma(GrayTRC); - Shapes[1] = cmsDupGamma(GrayTRC); - Shapes[2] = cmsDupGamma(GrayTRC); |