diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/argyllcms/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/argyllcms/files')
3 files changed, 51 insertions, 0 deletions
diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch new file mode 100644 index 000000000000..8808fe1ae8ac --- /dev/null +++ b/media-gfx/argyllcms/files/argyllcms-1.4.0-CVE-2012-4405.patch @@ -0,0 +1,18 @@ + +https://bugzilla.redhat.com/show_bug.cgi?id=854227 +https://bugzilla.redhat.com/attachment.cgi?id=609986 + +--- icc/icc.c 2012-04-19 09:36:49.000000000 +0200 ++++ icc/icc.c.oden 2012-09-12 12:35:49.252519528 +0200 +@@ -6065,6 +6065,11 @@ static int icmLut_read( + p->clutPoints = read_UInt8Number(bp+10); + + /* Sanity check */ ++ if (p->inputChan < 1) { ++ sprintf(icp->err,"icmLut_read: No input channels!"); ++ return icp->errc = 1; ++ } ++ + if (p->inputChan > MAX_CHAN) { + sprintf(icp->err,"icmLut_read: Can't handle > %d input channels\n",MAX_CHAN); + return icp->errc = 1; diff --git a/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch new file mode 100644 index 000000000000..d523481e3326 --- /dev/null +++ b/media-gfx/argyllcms/files/argyllcms-1.4.0-jpeg.patch @@ -0,0 +1,21 @@ +diff -ruN Argyll_V1.4.0.orig/Jamtop Argyll_V1.4.0/Jamtop +--- Argyll_V1.4.0.orig/Jamtop 2012-04-19 09:50:31.000000000 +0200 ++++ Argyll_V1.4.0/Jamtop 2012-05-07 02:18:37.000000000 +0200 +@@ -113,13 +113,13 @@ + # See if we have a system JPEG library. + if ! $(BUILTIN_JPEG) && $(UNIX) { + if [ GLOB /usr/include : jpeglib.h ] { +- if ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB /usr/lib : libjpg.a ] ) +- || $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [ GLOB /usr/lib64 : libjpg.a ] ) +- || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) { ++ if ! $(HOST64) && ( [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ] ) ++ || $(HOST64) && ( [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ] ) ++ || $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ) { + echo "Using system JPEG library" ; + JPEGLIB = ; + JPEGINC = ; +- LINKFLAGS += $(LINKFLAG)tiff ; ++ LINKFLAGS += $(LINKFLAG)jpeg ; + HAVE_JPEG = true ; + } + } diff --git a/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch b/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch new file mode 100644 index 000000000000..04f3367f6332 --- /dev/null +++ b/media-gfx/argyllcms/files/argyllcms-1.6.3-usb-db.patch @@ -0,0 +1,12 @@ +Index: trunk/usb/55-Argyll.rules +=================================================================== +--- trunk.orig/usb/55-Argyll.rules 2014-09-25 11:10:12.000000000 +0200 ++++ trunk/usb/55-Argyll.rules 2014-09-26 14:08:21.067295380 +0200 +@@ -85,6 +85,6 @@ + ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev" + + # Set ID_VENDOR and ID_MODEL acording to VID and PID +-TEST=="/lib/udev/usb-db", IMPORT{program}="usb-db %p" ++IMPORT{builtin}="hwdb --subsystem=usb" + + LABEL="argyll_rules_end" |