Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/colord/files: colord-0.1.15-fix-automagic-libgusb.patch
Date: Sun, 27 Nov 2011 07:18:12
Message-Id: 20111127071800.5D6172004C@flycatcher.gentoo.org
1 tetromino 11/11/27 07:18:00
2
3 Added: colord-0.1.15-fix-automagic-libgusb.patch
4 Log:
5 Bump, drop vulnerable version. 0.1.15 includes fixes for CVE-2011-4349 (same as in 0.1.14-r1), adds support for ColorHug, fixes assorted bugs. Dropped hppa keywords due to new optional libgusb dependency (bug #392057).
6
7 (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch?rev=1.1&content-type=text/plain
14
15 Index: colord-0.1.15-fix-automagic-libgusb.patch
16 ===================================================================
17 From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001
18 From: Alexandre Rostovtsev <tetromino@g.o>
19 Date: Sun, 27 Nov 2011 01:33:55 -0500
20 Subject: [PATCH] Make libgusb dependency non-automagic
21
22 ---
23 configure.ac | 8 +++++---
24 1 files changed, 5 insertions(+), 3 deletions(-)
25
26 diff --git a/configure.ac b/configure.ac
27 index 4732921..65abf67 100644
28 --- a/configure.ac
29 +++ b/configure.ac
30 @@ -126,11 +126,13 @@ dnl ---------------------------------------------------------------------------
31 dnl - Check library dependencies
32 dnl ---------------------------------------------------------------------------
33 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0)
34 -PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no)
35 -if test x$have_gusb = xyes; then
36 +AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
37 + enable_gusb=$enableval, enable_gusb=yes)
38 +if test x$enable_gusb != xno; then
39 + PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1)
40 AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
41 fi
42 -AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes)
43 +AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
44
45 PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no)
46 if test x$has_new_lcms = xyes; then
47 --
48 1.7.8.rc3