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)

4 files changed, 69 insertions, 9 deletions

diff --git a/x11-misc/colord/ChangeLog b/x11-misc/colord/ChangeLog
index efa9385ccb16..d494f04afd4d 100644
--- a/x11-misc/colord/ChangeLog
+++ b/x11-misc/colord/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/colord
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.8 2011/11/25 18:15:23 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/ChangeLog,v 1.9 2011/11/27 07:18:00 tetromino Exp $
+
+*colord-0.1.15 (27 Nov 2011)
+
+  27 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -colord-0.1.14.ebuild, +colord-0.1.15.ebuild,
+  +files/colord-0.1.15-fix-automagic-libgusb.patch, metadata.xml:
+  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).
 
 *colord-0.1.14-r1 (25 Nov 2011)
 
@@ -8,9 +17,9 @@
   -colord-0.1.12.ebuild, -colord-0.1.13.ebuild, +colord-0.1.14-r1.ebuild,
   +files/colord-0.1.14-sql-injections.patch,
   +files/colord-0.1.14-sql-injections-2.patch:
-  Add patches to fix SQL injections (bug #391879, thanks to Agostino Sarubbo for
-  reporting). Allow building against freebsd's libusb (bug #387959, thanks to
-  Naohiro Aota). Drop old versions.
+  Add patches to fix SQL injections (CVE-2011-4349, bug #391879, thanks to
+  Agostino Sarubbo for reporting). Allow building against freebsd's libusb
+  (bug #387959, thanks to Naohiro Aota). Drop old versions.
 
   06 Nov 2011; Markus Meier <maekke@gentoo.org> colord-0.1.14.ebuild:
   add ~arm, bug #387959
diff --git a/x11-misc/colord/colord-0.1.14.ebuild b/x11-misc/colord/colord-0.1.15.ebuild
index 97037239ed3e..a0dd246e0157 100644
--- a/x11-misc/colord/colord-0.1.14.ebuild
+++ b/x11-misc/colord/colord-0.1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.14.ebuild,v 1.2 2011/11/06 17:10:34 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/colord/colord-0.1.15.ebuild,v 1.1 2011/11/27 07:18:00 tetromino Exp $
 
 EAPI="4"
 
@@ -12,15 +12,17 @@ SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="doc examples +introspection scanner +udev vala"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc elibc_FreeBSD examples gusb +introspection scanner +udev vala"
 
 # FIXME: raise to libusb-1.0.9:1 when available
 COMMON_DEPEND="
 	dev-db/sqlite:3
 	>=dev-libs/glib-2.28.0:2
-	>=dev-libs/libusb-1.0.8:1
 	>=media-libs/lcms-2.2:2
+	elibc_FreeBSD? ( >=sys-freebsd/freebsd-lib-8.0[usb] )
+	!elibc_FreeBSD? ( >=dev-libs/libusb-1.0.8:1 )
+	gusb? ( >=dev-libs/libgusb-0.1.1 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	scanner? ( media-gfx/sane-backends )
 	udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
@@ -55,10 +57,23 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patch"
 
 	epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch"
+	epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch"
+
+	# Use <libusb.h> for freebsd compatibility, bug #387959#c6
+	sed -e 's:#include <libusb-1.0/libusb.h>:#include <libusb.h>:' \
+		-i src/sensors/*.c src/sensors/*.h || die "sed failed"
+
 	eautoreconf
 }
 
 src_configure() {
+	#  bug #387959#c6
+	if use elibc_FreeBSD; then
+		USB_CFLAGS="-I${EPREFIX}/usr/include"
+		USB_LIBS="-lusb"
+		echo "$USB_CFLAGS $USB_LIBS"
+	fi
+
 	# Disable polkit to allow registering devices when colord is running as
 	# non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
 	econf \
@@ -70,6 +85,7 @@ src_configure() {
 		--with-daemon-user=colord \
 		--localstatedir="${EPREFIX}"/var \
 		$(use_enable doc gtk-doc) \
+		$(use_enable gusb) \
 		$(use_enable introspection) \
 		$(use_enable scanner sane) \
 		$(use_enable udev gudev) \
diff --git a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
new file mode 100644
index 000000000000..8c7e93366dd5
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch
@@ -0,0 +1,33 @@
+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
+
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 60f2705cafd5..e5965187cae8 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/metadata.xml
@@ -3,8 +3,10 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
+		<flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support in drivers;
+			required for some colorimeter models, e.g. ColorHug</flag>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 			for introspection</flag>
-		<flag name='vala'>Generate bindings for <pkg>dev-lang/vala</pkg></flag>
+		<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>