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/ufraw/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/ufraw/files')
-rw-r--r-- | media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch | 28 | ||||
-rw-r--r-- | media-gfx/ufraw/files/ufraw-0.20-gimp.patch | 24 | ||||
-rw-r--r-- | media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch | 52 |
3 files changed, 104 insertions, 0 deletions
diff --git a/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch new file mode 100644 index 000000000000..aff7c5a25930 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.17-cfitsio-automagic.patch @@ -0,0 +1,28 @@ +diff -ru ufraw-0.17.orig/configure.ac ufraw-0.17/configure.ac +--- ufraw-0.17.orig/configure.ac 2010-04-02 16:16:08.000000000 +0200 ++++ ufraw-0.17/configure.ac 2010-04-02 16:19:33.000000000 +0200 +@@ -246,11 +246,19 @@ + [ have_png=no + AC_MSG_RESULT($LIBPNG_PKG_ERRORS) ] ) + +-PKG_CHECK_MODULES(CFITSIO, cfitsio, +- [ have_cfitsio=yes +- AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ], +- [ have_cfitsio=no +- AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ++AC_ARG_WITH([cfitsio], ++ [AS_HELP_STRING([--with-cfitsio], ++ [build fits support @<:@default=check@:>@])], ++ [], ++ [with_cfitsio=check]) ++ ++have_cfitsio=no ++AS_IF([test "x$with_cfitsio" != xno], ++ [PKG_CHECK_MODULES(CFITSIO, cfitsio, ++ [ have_cfitsio=yes ++ AC_DEFINE(HAVE_LIBCFITSIO, 1, have the cfitsio library) ], ++ [ have_cfitsio=no ++ AC_MSG_RESULT($CFITSIO_PKG_ERRORS) ] ) ] ) + + PKG_CHECK_MODULES(EXIV2, exiv2 >= 0.16, + [ have_exiv2=yes diff --git a/media-gfx/ufraw/files/ufraw-0.20-gimp.patch b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch new file mode 100644 index 000000000000..5ce607c3179a --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.20-gimp.patch @@ -0,0 +1,24 @@ +http://ufraw.cvs.sourceforge.net/viewvc/ufraw/ufraw/ufraw-gimp.c?r1=1.82&r2=1.83&diff_format=u +http://sourceforge.net/p/ufraw/bugs/392/ +https://bugs.gentoo.org/show_bug.cgi?id=527836 + +--- ufraw-gimp.c 2014/01/07 13:00:08 1.82 ++++ ufraw-gimp.c 2014/10/20 04:00:10 1.83 +@@ -79,12 +79,16 @@ + load_args, + load_return_vals); + ++#if HAVE_GIMP_2_9 + gimp_register_magic_load_handler("file_ufraw_load", + (char *)raw_ext, + "", + "0,string,II*\\0," + "0,string,MM\\0*," + "0,string,<?xml"); ++#else ++ gimp_register_load_handler("file_ufraw_load", (char *)raw_ext, ""); ++#endif + + gimp_install_procedure("file_ufraw_load_thumb", + "Loads thumbnails from digital camera raw files.", + diff --git a/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch b/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch new file mode 100644 index 000000000000..c17c66c41ab7 --- /dev/null +++ b/media-gfx/ufraw/files/ufraw-0.21-CVE-2015-3885.patch @@ -0,0 +1,52 @@ +From 6b4ff65c6fc1a88eaa7bfc1ee5a25413d171b5f7 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Thu, 21 May 2015 13:47:29 +0200 +Subject: [PATCH] patch: CVE-2015-3885 + +Squashed commit of the following: + +commit 8f2a2348638f74e059069d98a6329fcc656ae4b5 +Author: Nils Philippsen <nils@redhat.com> +Date: Tue May 19 11:36:57 2015 +0200 + + CVE-2015-3885: avoid overflowing array + + When reading raw image files containing lossless JPEG data, headers + could be manipulated to make the signed int variable 'len' negative + which specifies how much actual data follows. Interpreted as unsigned, + this could lead to reading file data past the 64k boundary of the array + used for storing it. To avoid that, make 'len' unsigned short, and bail + out early if its value would become invalid (i.e. <= 0). +--- + dcraw.cc | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/dcraw.cc b/dcraw.cc +index 75ea121..d9f96ff 100644 +--- a/dcraw.cc ++++ b/dcraw.cc +@@ -934,7 +934,8 @@ struct jhead { + + int CLASS ljpeg_start (struct jhead *jh, int info_only) + { +- int c, tag, len; ++ int c, tag; ++ ushort len; + uchar data[0x10000]; + const uchar *dp; + +@@ -945,8 +946,9 @@ int CLASS ljpeg_start (struct jhead *jh, int info_only) + do { + fread (data, 2, 2, ifp); + tag = data[0] << 8 | data[1]; +- len = (data[2] << 8 | data[3]) - 2; +- if (tag <= 0xff00) return 0; ++ len = (data[2] << 8 | data[3]); ++ if (tag <= 0xff00 || len <= 2) return 0; ++ len -= 2; + fread (data, 1, len, ifp); + switch (tag) { + case 0xffc3: +-- +2.4.1 + |