[gentoo-commits] gentoo-x86 commit in x11-misc/colord/files: colord-0.1.15-fix-automagic-libgusb.patch

[gentoo-commits] gentoo-x86 commit in x11-misc/colord/files: colord-0.1.15-fix-automagic-libgusb.patch

[Alexandre Rostovtsev (tetromino)]

tetromino    11/11/27 07:18:00

  Added:                colord-0.1.15-fix-automagic-libgusb.patch
  Log:
  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).
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch

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
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

Index: colord-0.1.15-fix-automagic-libgusb.patch
===================================================================
From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 27 Nov 2011 01:33:55 -0500
Subject: [PATCH] Make libgusb dependency non-automagic

---
 configure.ac |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4732921..65abf67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -126,11 +126,13 @@ dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
 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)
-PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no)
-if test x$have_gusb = xyes; then
+AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]),
+	      enable_gusb=$enableval, enable_gusb=yes)
+if test x$enable_gusb != xno; then
+	PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1)
 	AC_DEFINE(HAVE_GUSB,1,[whether gusb is available])
 fi
-AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes)
+AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes)
 
 PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no)
 if test x$has_new_lcms = xyes; then
-- 
1.7.8.rc3