From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-389017-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RAwFL-0000lr-Mo
for garchives@archives.gentoo.org; Tue, 04 Oct 2011 04:04:47 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 64E1721C04C;
Tue, 4 Oct 2011 04:04:35 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2244E21C04C
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Oct 2011 04:04:34 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7330B1B4014
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Oct 2011 04:04:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id C75358004B
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Oct 2011 04:04:33 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <5c3fe8d42b5ee65a3b73798f53e09e3c50f8b276.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/
X-VCS-Repository: proj/gnome
X-VCS-Files: x11-misc/colord/colord-0.1.13.ebuild x11-misc/colord/colord-9999.ebuild x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissions.patch
X-VCS-Directories: x11-misc/colord/files/ x11-misc/colord/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Restovtsev
X-VCS-Revision: 5c3fe8d42b5ee65a3b73798f53e09e3c50f8b276
Date: Tue, 4 Oct 2011 04:04:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 37f481f8f70c66f8aa944ad073626c5b
commit: 5c3fe8d42b5ee65a3b73798f53e09e3c50f8b276
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Oct 4 03:20:08 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Oct 4 03:56:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D5c3fe8d4
x11-misc/colord: add 0.1.13
Version bump. Follow Ubuntu's example and disable polkit support,
switching to dbus security instead, to allow users to access colord when
it's running as a non-root user; see
https://bugs.launchpad.net/ubuntu/+source/colord/+bug/837851
This fixes various polkit errors at gnome-3.2 startup.
Also, sync with ebuild changes in gx86.
---
.../{colord-9999.ebuild =3D> colord-0.1.13.ebuild} | 19 +++++++---
x11-misc/colord/colord-9999.ebuild | 19 +++++++---
...-0.1.13-use-dbus-security-for-permissions.patch | 36 ++++++++++++++=
++++++
3 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-=
0.1.13.ebuild
similarity index 86%
copy from x11-misc/colord/colord-9999.ebuild
copy to x11-misc/colord/colord-0.1.13.ebuild
index 34b74ca..3615593 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-0.1.13.ebuild
@@ -27,20 +27,19 @@ else
fi
IUSE=3D"doc examples +introspection scanner +udev"
=20
-# XXX: raise to libusb-1.0.9:1 when available
+# FIXME: raise to libusb-1.0.9:1 when available
COMMON_DEPEND=3D"
dev-db/sqlite:3
>=3Ddev-libs/glib-2.28.0:2
>=3Ddev-libs/libusb-1.0.8:1
>=3Dmedia-libs/lcms-2.2:2
- >=3Dsys-auth/polkit-0.97
introspection? ( >=3Ddev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND=3D"${COMMON_DEPEND}
media-gfx/shared-color-profiles"
-# XXX: automagic build-time vala dependency if USE=3Dintrospection
+# Automagic build-time vala dependency if USE=3Dintrospection
DEPEND=3D"${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -51,7 +50,7 @@ DEPEND=3D"${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=3Ddev-util/gtk-doc-1.9
)
- introspection? ( dev-lang/vala:0.12 )
+ introspection? ( dev-lang/vala:0.14 )
"
=20
# FIXME: needs pre-installed dbus service files
@@ -64,11 +63,19 @@ pkg_setup() {
enewuser colord -1 -1 /var/lib/colord colord
}
=20
+src_prepare() {
+ # Ubuntu patch to allow root and at_console to access colord without po=
lkit;
+ # this behavior matches upstream default polkit settings.
+ epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patc=
h"
+}
+
src_configure() {
+ # Disable polkit to allow registering devices when colord is running as
+ # non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/83785=
1
econf \
--disable-examples \
--disable-static \
- --enable-polkit \
+ --disable-polkit \
--enable-reverse \
--disable-volume-search \
--with-daemon-user=3Dcolord \
@@ -77,7 +84,7 @@ src_configure() {
$(use_enable introspection) \
$(use_enable scanner sane) \
$(use_enable udev gudev) \
- VAPIGEN=3D$(type -p vapigen-0.12)
+ VAPIGEN=3D$(type -p vapigen-0.14)
# parallel make fails in doc/api
use doc && MAKEOPTS=3D-j1
}
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-=
9999.ebuild
index 34b74ca..3615593 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -27,20 +27,19 @@ else
fi
IUSE=3D"doc examples +introspection scanner +udev"
=20
-# XXX: raise to libusb-1.0.9:1 when available
+# FIXME: raise to libusb-1.0.9:1 when available
COMMON_DEPEND=3D"
dev-db/sqlite:3
>=3Ddev-libs/glib-2.28.0:2
>=3Ddev-libs/libusb-1.0.8:1
>=3Dmedia-libs/lcms-2.2:2
- >=3Dsys-auth/polkit-0.97
introspection? ( >=3Ddev-libs/gobject-introspection-0.9.8 )
scanner? ( media-gfx/sane-backends )
udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
"
RDEPEND=3D"${COMMON_DEPEND}
media-gfx/shared-color-profiles"
-# XXX: automagic build-time vala dependency if USE=3Dintrospection
+# Automagic build-time vala dependency if USE=3Dintrospection
DEPEND=3D"${COMMON_DEPEND}
app-text/docbook-sgml-utils
dev-libs/libxslt
@@ -51,7 +50,7 @@ DEPEND=3D"${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
>=3Ddev-util/gtk-doc-1.9
)
- introspection? ( dev-lang/vala:0.12 )
+ introspection? ( dev-lang/vala:0.14 )
"
=20
# FIXME: needs pre-installed dbus service files
@@ -64,11 +63,19 @@ pkg_setup() {
enewuser colord -1 -1 /var/lib/colord colord
}
=20
+src_prepare() {
+ # Ubuntu patch to allow root and at_console to access colord without po=
lkit;
+ # this behavior matches upstream default polkit settings.
+ epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patc=
h"
+}
+
src_configure() {
+ # Disable polkit to allow registering devices when colord is running as
+ # non-root; https://bugs.launchpad.net/ubuntu/+source/colord/+bug/83785=
1
econf \
--disable-examples \
--disable-static \
- --enable-polkit \
+ --disable-polkit \
--enable-reverse \
--disable-volume-search \
--with-daemon-user=3Dcolord \
@@ -77,7 +84,7 @@ src_configure() {
$(use_enable introspection) \
$(use_enable scanner sane) \
$(use_enable udev gudev) \
- VAPIGEN=3D$(type -p vapigen-0.12)
+ VAPIGEN=3D$(type -p vapigen-0.14)
# parallel make fails in doc/api
use doc && MAKEOPTS=3D-j1
}
diff --git a/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-pe=
rmissions.patch b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-f=
or-permissions.patch
new file mode 100644
index 0000000..8ae60c2
--- /dev/null
+++ b/x11-misc/colord/files/colord-0.1.13-use-dbus-security-for-permissio=
ns.patch
@@ -0,0 +1,36 @@
+Index: colord/data/org.freedesktop.ColorManager.conf.in
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
+--- colord.orig/data/org.freedesktop.ColorManager.conf.in 2011-09-01 17:=
59:58.330626765 +1000
++++ colord/data/org.freedesktop.ColorManager.conf.in 2011-09-01 18:02:25=
.410628315 +1000
+@@ -16,8 +16,8 @@
+ <allow own=3D"org.freedesktop.ColorManager"/>
+ </policy>
+=20
+- <!-- Allow anyone to call into the service - we'll reject callers usin=
g PolicyKit -->
+- <policy context=3D"default">
++ <!-- Use at_console policy rather than PolicyKit to allow running as c=
olord user -->
++ <policy at_console=3D"true">
+ <allow send_destination=3D"org.freedesktop.ColorManager"
+ send_interface=3D"org.freedesktop.ColorManager"/>
+ <allow send_destination=3D"org.freedesktop.ColorManager"
+@@ -32,5 +32,20 @@
+ send_interface=3D"org.freedesktop.DBus.Introspectable"/>
+ </policy>
+=20
++ <!-- Also allow root to access the API; cupsd needs to talk to colord=
-->
++ <policy user=3D"root">
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.ColorManager"/>
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.ColorManager.Profile"/>
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.ColorManager.Device"/>
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.ColorManager.Sensor"/>
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.DBus.Properties"/>
++ <allow send_destination=3D"org.freedesktop.ColorManager"
++ send_interface=3D"org.freedesktop.DBus.Introspectable"/>
++ </policy>
+ </busconfig>
+=20